X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b8fe1071ca5eb67ce493e9473aeeb84e9357c2..451673f7c982d9410c7ef799c6c47c8cacfed1d6:/configure?ds=sidebyside diff --git a/configure b/configure index 755762aeb8..43017aedf7 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 49043 2007-10-04 15:59:09Z MW . +# From configure.in Id: configure.in 55576 2008-09-12 20:57:41Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -723,7 +723,6 @@ STD_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT -wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF @@ -738,10 +737,11 @@ CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML -EXTRALIBS_ODBC +EXTRALIBS_MEDIA EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL +EXTRALIBS_STC WITH_PLUGIN_SDL EXTRALIBS_GTKPRINT EXTRALIBS_GNOMEPRINT @@ -831,9 +831,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 -COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 -COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 +COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_0_USE_STC_1 COND_MONOLITHIC_0_SHARED_0_USE_XRC_1 @@ -842,19 +841,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 -COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 -COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 +COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1 COND_MONOLITHIC_0_SHARED_1_USE_STC_1 COND_MONOLITHIC_0_SHARED_1_USE_XRC_1 COND_MONOLITHIC_0_USE_AUI_1 COND_MONOLITHIC_0_USE_GUI_1 COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1 -COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 -COND_MONOLITHIC_0_USE_ODBC_1 +COND_MONOLITHIC_0_USE_PROPGRID_1 COND_MONOLITHIC_0_USE_QA_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 @@ -867,16 +864,16 @@ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 -COND_PLATFORM_MACOSX_1_TOOLKIT_ -COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA -COND_PLATFORM_MACOSX_1_TOOLKIT_GTK -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1 -COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF -COND_PLATFORM_MACOSX_1_TOOLKIT_X11 +COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_USE_GUI_1 +COND_PLATFORM_MACOSX_1_USE_OPENGL_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 +COND_PLATFORM_MAC_0 COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MSDOS_1 @@ -898,14 +895,11 @@ COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_USE_STC_1 -COND_SHARED_0_USE_XRC_1 COND_SHARED_0_WXUSE_EXPAT_BUILTIN -COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 -COND_SHARED_1_USE_XRC_1 COND_TOOLKIT_ COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1 @@ -917,12 +911,11 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_ COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_MAC -COND_TOOLKIT_MAC_USE_GUI_1 -COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF @@ -932,6 +925,13 @@ COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW_WXUNIV_0 +COND_TOOLKIT_OSX_CARBON +COND_TOOLKIT_OSX_CARBON_USE_GUI_1 +COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0 +COND_TOOLKIT_OSX_COCOA +COND_TOOLKIT_OSX_COCOA_USE_GUI_1 +COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 +COND_TOOLKIT_OSX_IPHONE COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 @@ -952,7 +952,6 @@ COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN -COND_USE_ODBC_1 COND_USE_OPENGL_1 COND_USE_PCH_1 COND_USE_PLUGINS_0 @@ -975,7 +974,6 @@ COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN -COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN DEREZ @@ -1003,7 +1001,6 @@ WXCONFIG_LIBS WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WXCONFIG_RESFLAGS -EXE_LINKER GUIDIST DISTDIR SAMPLES_SUBDIRS @@ -1650,7 +1647,6 @@ Optional Features: --disable-gtk2 use GTK+ 1.2 instead of 2.0 --enable-gpe use GNOME PDA Environment features if possible --disable-shared create static library instead of shared - --disable-optimise create optimised code --enable-debug same as debug_flag and debug_info --enable-stl use STL for containers --enable-std_iostreams use standard C++ stream classes @@ -1658,11 +1654,12 @@ Optional Features: --disable-unicode compile without Unicode support --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only) --enable-utf8 use UTF-8 representation for strings (Unix only) - --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) + --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only) --enable-extended_rtti use extended RTTI (XTI) --enable-omf use OMF object format --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!) --enable-debug_info create code with debugging information + --disable-optimise compile without optimisations --enable-debug_gdb create code with extra GDB debugging information --enable-debug_cntxt use wxDebugContext --enable-mem_tracing create code with memory tracing @@ -1679,12 +1676,14 @@ Optional Features: --enable-objc_uniquifying enable Objective-C class name uniquifying --disable-visibility disable use of ELF symbols visibility even if supported --enable-intl use internationalization system + --enable-xlocale use x-locale support (requires wxLocale) --enable-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes --enable-ftp use wxFTP (requires wxProtocol --enable-http use wxHTTP (requires wxProtocol --enable-fileproto use wxFileProto class (requires wxProtocol --enable-sockets use socket/network classes + --enable-ipv6 enable IPv6 support in wxSocket --enable-ole use OLE classes (Win32 only) --enable-dataobj use data object classes --enable-ipc use interprocess communication (wxSocket etc.) @@ -1715,7 +1714,9 @@ Optional Features: --enable-log use logging system --enable-longlong use wxLongLong class --enable-mimetype use wxMimeTypesManager + --enable-printfposparam use wxVsnprintf() which supports positional parameters --enable-snglinst use wxSingleInstanceChecker class + --enable-sound use wxSound class --enable-stdpaths use wxStandardPaths class --enable-stopwatch use wxStopWatch class --enable-streams use wxStream etc classes @@ -1724,13 +1725,9 @@ Optional Features: --enable-textbuf use wxTextBuffer class --enable-textfile use wxTextFile class --enable-timer use wxTimer class - --enable-sound use wxSound class - --enable-mediactrl use wxMediaCtrl class - --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix - --enable-printfposparam use wxVsnprintf() which supports positional parameters + --enable-variant use wxVariant class --enable-zipstream use wxZip streams --enable-url use wxURL class - --enable-variant use wxVariant class --enable-protocol use wxProtocol class --enable-protocol-http HTTP support in wxProtocol --enable-protocol-ftp FTP support in wxProtocol @@ -1745,18 +1742,21 @@ Optional Features: --enable-htmlhelp use wxHTML-based help --enable-xrc use XRC resources sub-library --enable-aui use AUI docking library + --enable-propgrid use wxPropertyGrid library --enable-stc use wxStyledTextCtrl library --enable-constraints use layout-constraints system - --enable-printarch use printing architecture - --enable-mdi use multiple document interface architecture - --enable-mdidoc use docview architecture with MDI --enable-loggui use standard GUI logger --enable-logwin use wxLogWindow --enable-logdialog use wxLogDialog + --enable-mdi use multiple document interface architecture + --enable-mdidoc use docview architecture with MDI + --enable-mediactrl use wxMediaCtrl class + --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix --enable-webkit use wxWebKitCtrl (Mac) --enable-richtext use wxRichTextCtrl --enable-graphics_ctx use graphics context 2D drawing API --enable-postscript use wxPostscriptDC device context (default for gtk+) + --enable-printarch use printing architecture --enable-svg use wxSVGFileDC device context --enable-clipboard use wxClipboard class --enable-dnd use Drag'n'Drop classes @@ -1794,6 +1794,7 @@ Optional Features: --enable-listbox use wxListBox class --enable-listctrl use wxListCtrl class --enable-notebook use wxNotebook class + --enable-notifmsg use wxNotificationMessage class --enable-odcombobox use wxOwnerDrawnComboBox class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class @@ -1854,12 +1855,13 @@ Optional Features: --enable-iff use iff images (IFF file format) --enable-pnm use pnm images (PNM file format) --enable-xpm use xpm images (XPM file format) - --enable-icocur use Windows ICO and CUR formats + --enable-ico_cur use Windows ICO and CUR formats --enable-dccache cache temporary wxDC objects (Win32 only) --enable-ps-in-msw use PS printing in wxMSW (Win32 only) - --enable-ownerdrawn use owner drawn controls (Win32 only) + --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) + --enable-autoidman use automatic ids management --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program @@ -1879,7 +1881,9 @@ Optional Packages: --with-themes=all|list use only the specified comma-separated list of wxUniversal themes --with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any" --with-motif use Motif/Lesstif - --with-mac use Mac OS X + --with-osx_carbon use Mac OS X (Carbon) + --with-osx_cocoa use Mac OS X (Cocoa) + --with-mac use Mac OS X (Default) --with-cocoa use Cocoa --with-wine use Wine --with-msw use MS-Windows @@ -1892,6 +1896,7 @@ Optional Packages: --with-libjpeg use libjpeg (JPEG file format) --with-libtiff use libtiff (TIFF file format) --with-libxpm use libxpm (XPM file format) + --with-libiconv use libiconv (character conversion) --with-libmspack use libmspack (CHM help files loading) --without-gtkprint don't use GTK printing support --without-gnomeprint don't use GNOME printing libraries @@ -1902,7 +1907,6 @@ Optional Packages: --with-sdl use SDL for audio on Unix --with-regex enable support for wxRegEx class --with-zlib use zlib for LZW compression - --with-odbc use the IODBC and wxODBC classes --with-expat enable XML support using expat parser --with-macosx-sdk=PATH use an OS X SDK at PATH --with-macosx-version-min=VER build binaries which require at least this OS X version @@ -2597,11 +2601,12 @@ USE_ALPHA= NEEDS_D_REENTRANT_FOR_R_FUNCS=0 -ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB" +ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB" DEFAULT_wxUSE_COCOA=0 DEFAULT_wxUSE_GTK=0 -DEFAULT_wxUSE_MAC=0 +DEFAULT_wxUSE_OSX_CARBON=0 +DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_wxUSE_MGL=0 DEFAULT_wxUSE_MICROWIN=0 DEFAULT_wxUSE_MOTIF=0 @@ -2612,7 +2617,8 @@ DEFAULT_wxUSE_DFB=0 DEFAULT_DEFAULT_wxUSE_COCOA=0 DEFAULT_DEFAULT_wxUSE_GTK=0 -DEFAULT_DEFAULT_wxUSE_MAC=0 +DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0 +DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0 DEFAULT_DEFAULT_wxUSE_MGL=0 DEFAULT_DEFAULT_wxUSE_MICROWIN=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 @@ -2896,14 +2902,14 @@ _ACEOF #define TARGET_CARBON 1 _ACEOF - DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 DEFAULT_STD_FLAG=no ;; powerpc-apple-macos* ) USE_UNIX=0 ac_cv_c_bigendian=yes SO_SUFFIX=shlib - DEFAULT_DEFAULT_wxUSE_MAC=1 + DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 DEFAULT_STD_FLAG=no ;; @@ -2927,14 +2933,6 @@ esac - - wx_arg_cache_file="configarg.cache" - echo "loading argument cache $wx_arg_cache_file" - rm -f ${wx_arg_cache_file}.tmp - touch ${wx_arg_cache_file}.tmp - touch ${wx_arg_cache_file} - - DEFAULT_wxUSE_ALL_FEATURES=yes DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG @@ -2945,14 +2943,14 @@ DEFAULT_wxUSE_LIBGNOMEVFS=no DEFAULT_wxUSE_LIBHILDON=no DEFAULT_wxUSE_LIBMSPACK=no DEFAULT_wxUSE_LIBSDL=no -DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no DEFAULT_wxUSE_ACCESSIBILITY=no -DEFAULT_wxUSE_DATAVIEWCTRL=no DEFAULT_wxUSE_GRAPHICS_CONTEXT=no +DEFAULT_wxUSE_IPV6=no DEFAULT_wxUSE_MEDIACTRL=no DEFAULT_wxUSE_TAB_DIALOG=no +DEFAULT_wxUSE_GSTREAMER8=no DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no @@ -2966,21 +2964,6 @@ DEFAULT_wxUSE_GTK2=yes DEFAULT_wxUSE_OBJC_UNIQUIFYING=no -for toolkit in `echo $ALL_TOOLKITS`; do - LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}` - if test "x$LINE" != "x" ; then - has_toolkit_in_cache=1 - eval "DEFAULT_$LINE" - eval "CACHE_$toolkit=1" - - LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}` - if test "x$LINE" != "x" ; then - eval "DEFAULT_$LINE" - fi - fi -done - - @@ -3004,27 +2987,15 @@ if test "${enable_gui+set}" = set; then else wx_cv_use_gui='wxUSE_GUI=no' fi - cache=yes else - LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" fi eval "$wx_cv_use_gui" - if test "x$cache" = xyes; then - echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GUI = yes; then @@ -3060,27 +3031,15 @@ if test "${enable_monolithic+set}" = set; then else wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' fi - cache=yes else - LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" fi eval "$wx_cv_use_monolithic" - if test "x$cache" = xyes; then - echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MONOLITHIC = yes; then @@ -3116,27 +3075,15 @@ if test "${enable_plugins+set}" = set; then else wx_cv_use_plugins='wxUSE_PLUGINS=no' fi - cache=yes else - LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" fi eval "$wx_cv_use_plugins" - if test "x$cache" = xyes; then - echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PLUGINS = yes; then @@ -3172,27 +3119,15 @@ if test "${with_subdirs+set}" = set; then else wx_cv_use_subdirs='wxWITH_SUBDIRS=no' fi - cache=yes else - LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" fi eval "$wx_cv_use_subdirs" - if test "x$cache" = xyes; then - echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxWITH_SUBDIRS = yes; then @@ -3234,27 +3169,15 @@ if test "${enable_official_build+set}" = set; then 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 @@ -3299,27 +3222,15 @@ if test "${enable_all_features+set}" = set; then 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 @@ -3359,27 +3270,15 @@ if test "${enable_universal+set}" = set; then else wx_cv_use_universal='wxUSE_UNIVERSAL=no' fi - cache=yes else - LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" fi eval "$wx_cv_use_universal" - if test "x$cache" = xyes; then - echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNIVERSAL = yes; then @@ -3416,9 +3315,21 @@ if test "${with_motif+set}" = set; then fi +# Check whether --with-osx_carbon was given. +if test "${with_osx_carbon+set}" = set; then + withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 +fi + + +# Check whether --with-osx_cocoa was given. +if test "${with_osx_cocoa+set}" = set; then + withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1 +fi + + # Check whether --with-mac was given. if test "${with_mac+set}" = set; then - withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1 + withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1 fi @@ -3490,27 +3401,15 @@ if test "${enable_nanox+set}" = set; then else wx_cv_use_nanox='wxUSE_NANOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" fi eval "$wx_cv_use_nanox" - if test "x$cache" = xyes; then - echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NANOX = yes; then @@ -3552,27 +3451,15 @@ if test "${enable_gpe+set}" = set; then else wx_cv_use_gpe='wxUSE_GPE=no' fi - cache=yes else - LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" fi eval "$wx_cv_use_gpe" - if test "x$cache" = xyes; then - echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GPE = yes; then @@ -3589,6 +3476,106 @@ echo "${ECHO_T}$result" >&6; } +{ echo "$as_me:$LINENO: checking for toolkit" >&5 +echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; } + + + +# In Wine, we need to default to MSW, not GTK or MOTIF +if test "$wxUSE_WINE" = "yes"; then + DEFAULT_DEFAULT_wxUSE_GTK=0 + DEFAULT_DEFAULT_wxUSE_MOTIF=0 + DEFAULT_DEFAULT_wxUSE_MSW=1 + wxUSE_SHARED=no + CC=${CC:-winegcc} + CXX=${CXX:-wineg++} +fi + + +if test "$wxUSE_GUI" = "yes"; then + + if test "$USE_BEOS" = 1; then + { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5 +echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} + { (exit 1); exit 1; }; } + fi + + if test "$TOOLKIT_GIVEN" = 1; then + for toolkit in $ALL_TOOLKITS; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "x$value" = "xno"; then + eval "$var=0" + elif test "x$value" != "x"; then + eval "$var=1" + fi + + if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then + eval "wx${toolkit}_VERSION=$value" + fi + done + else + for toolkit in $ALL_TOOLKITS; do + var=DEFAULT_DEFAULT_wxUSE_$toolkit + eval "wxUSE_$toolkit=\$${var}" + done + fi + + NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \ + + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \ + + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` + + case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` + esac + + case "$NUM_TOOLKITS" in + 1) + ;; + 0) + { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5 +echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;} + { (exit 1); exit 1; }; } + ;; + *) + { { echo "$as_me:$LINENO: error: Please specify at most one toolkit" >&5 +echo "$as_me: error: Please specify at most one toolkit" >&2;} + { (exit 1); exit 1; }; } + esac + + # to be removed when --disable-gtk2 isn't needed + if test "x$wxUSE_GTK2" = "xyes"; then + wxGTK_VERSION=2 + elif test "x$wxUSE_GTK2" = "xno"; then + wxGTK_VERSION=1 + fi + + for toolkit in $ALL_TOOLKITS; do + var=wxUSE_$toolkit + eval "value=\$${var}" + if test "$value" = 1; then + toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'` + { echo "$as_me:$LINENO: result: $toolkit_echo" >&5 +echo "${ECHO_T}$toolkit_echo" >&6; } + fi + done +else + if test "x$host_alias" != "x"; then + { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 +echo "${ECHO_T}base ($host_alias hosted) only" >&6; } + else + { echo "$as_me:$LINENO: result: base only" >&5 +echo "${ECHO_T}base only" >&6; } + fi +fi + +wxUSE_MAC=0 +if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then + wxUSE_MAC=1 +fi + + { echo "$as_me:$LINENO: checking for --with-libpng" >&5 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; } @@ -3609,27 +3596,15 @@ if test "${with_libpng+set}" = set; then echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libpng" - if test "x$cache" = xyes; then - echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBPNG" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3669,27 +3644,15 @@ if test "${with_libjpeg+set}" = set; then echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libjpeg" - if test "x$cache" = xyes; then - echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBJPEG" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3729,27 +3692,15 @@ if test "${with_libtiff+set}" = set; then echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libtiff" - if test "x$cache" = xyes; then - echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBTIFF" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3789,27 +3740,15 @@ if test "${with_libxpm+set}" = set; then echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_libxpm" - if test "x$cache" = xyes; then - echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_LIBXPM" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -3830,6 +3769,50 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or fi + withstring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${withstring:-with}-libiconv" >&5 +echo $ECHO_N "checking for --${withstring:-with}-libiconv... $ECHO_C" >&6; } + +# Check whether --with-libiconv was given. +if test "${with_libiconv+set}" = set; then + withval=$with_libiconv; + if test "$withval" = yes; then + wx_cv_use_libiconv='wxUSE_LIBICONV=yes' + else + wx_cv_use_libiconv='wxUSE_LIBICONV=no' + fi + +else + + wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}" + +fi + + + eval "$wx_cv_use_libiconv" + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBICONV = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBICONV + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + withstring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -3850,27 +3833,15 @@ if test "${with_libmspack+set}" = set; then else wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' fi - cache=yes else - LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" fi eval "$wx_cv_use_libmspack" - if test "x$cache" = xyes; then - echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBMSPACK = yes; then @@ -3906,27 +3877,15 @@ if test "${with_gtkprint+set}" = set; then else wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' fi - cache=yes else - LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" fi eval "$wx_cv_use_gtkprint" - if test "x$cache" = xyes; then - echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_GTKPRINT = yes; then @@ -3962,27 +3921,15 @@ if test "${with_gnomeprint+set}" = set; then else wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' fi - cache=yes else - LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" fi eval "$wx_cv_use_gnomeprint" - if test "x$cache" = xyes; then - echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBGNOMEPRINT = yes; then @@ -4018,27 +3965,15 @@ if test "${with_gnomevfs+set}" = set; then else wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' fi - cache=yes else - LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" fi eval "$wx_cv_use_gnomevfs" - if test "x$cache" = xyes; then - echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBGNOMEVFS = yes; then @@ -4074,27 +4009,15 @@ if test "${with_hildon+set}" = set; then else wx_cv_use_hildon='wxUSE_LIBHILDON=no' fi - cache=yes else - LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" fi eval "$wx_cv_use_hildon" - if test "x$cache" = xyes; then - echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_LIBHILDON = yes; then @@ -4130,27 +4053,15 @@ if test "${with_opengl+set}" = set; then else wx_cv_use_opengl='wxUSE_OPENGL=no' fi - cache=yes else - LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" fi eval "$wx_cv_use_opengl" - if test "x$cache" = xyes; then - echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_OPENGL = yes; then @@ -4189,27 +4100,15 @@ if test "${with_dmalloc+set}" = set; then else wx_cv_use_dmalloc='wxUSE_DMALLOC=no' fi - cache=yes else - LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" fi eval "$wx_cv_use_dmalloc" - if test "x$cache" = xyes; then - echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp - fi if test x"$withstring" = xwithout; then if test $wxUSE_DMALLOC = yes; then @@ -4245,27 +4144,15 @@ if test "${with_sdl+set}" = set; then 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 @@ -4300,27 +4187,15 @@ if test "${with_regex+set}" = set; then echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_regex" - if test "x$cache" = xyes; then - echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_REGEX" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4360,27 +4235,15 @@ if test "${with_zlib+set}" = set; then echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_zlib" - if test "x$cache" = xyes; then - echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_ZLIB" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4401,66 +4264,6 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b fi - { echo "$as_me:$LINENO: checking for --with-odbc" >&5 -echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; } - -# Check whether --with-odbc was given. -if test "${with_odbc+set}" = set; then - withval=$with_odbc; - if test "$withval" = yes; then - wx_cv_use_odbc='wxUSE_ODBC=yes' - elif test "$withval" = no; then - wx_cv_use_odbc='wxUSE_ODBC=no' - elif test "$withval" = sys; then - wx_cv_use_odbc='wxUSE_ODBC=sys' - elif test "$withval" = builtin; then - wx_cv_use_odbc='wxUSE_ODBC=builtin' - else - { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5 -echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} - { (exit 1); exit 1; }; } - fi - cache=yes - -else - - LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" - -fi - - - eval "$wx_cv_use_odbc" - if test "x$cache" = xyes; then - echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp - fi - - if test "$wxUSE_ODBC" = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - elif test "$wxUSE_ODBC" = no; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - elif test "$wxUSE_ODBC" = sys; then - { echo "$as_me:$LINENO: result: system version" >&5 -echo "${ECHO_T}system version" >&6; } - elif test "$wxUSE_ODBC" = builtin; then - { echo "$as_me:$LINENO: result: builtin version" >&5 -echo "${ECHO_T}builtin version" >&6; } - else - { { echo "$as_me:$LINENO: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&5 -echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} - { (exit 1); exit 1; }; } - fi - - { echo "$as_me:$LINENO: checking for --with-expat" >&5 echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; } @@ -4480,27 +4283,15 @@ if test "${with_expat+set}" = set; then echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi - cache=yes else - LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" fi eval "$wx_cv_use_expat" - if test "x$cache" = xyes; then - echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp - fi if test "$wxUSE_EXPAT" = yes; then { echo "$as_me:$LINENO: result: yes" >&5 @@ -4529,18 +4320,6 @@ if test "${with_macosx_sdk+set}" = set; then withval=$with_macosx_sdk; wxUSE_MACOSX_SDK=$withval wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" - echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp - -else - - # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no) - # will override --enable-universal_binary's automatic SDK usage. - wxUSE_MACOSX_SDK= - LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "$LINE" - echo "$LINE" >> ${wx_arg_cache_file}.tmp - fi fi @@ -4555,19 +4334,6 @@ if test "${with_macosx_version_min+set}" = set; then withval=$with_macosx_version_min; wxUSE_MACOSX_VERSION_MIN=$withval wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" - echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp - -else - - # default "yes" because when not using an SDK it means the same as no - # but when using an SDK it means to use the SDK version - wxUSE_MACOSX_VERSION_MIN=yes - # See if there is a value in the cache - LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "$LINE" - echo "$LINE" >> ${wx_arg_cache_file}.tmp - fi fi @@ -4596,27 +4362,15 @@ if test "${enable_shared+set}" = set; then else wx_cv_use_shared='wxUSE_SHARED=no' fi - cache=yes else - LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" fi eval "$wx_cv_use_shared" - if test "x$cache" = xyes; then - echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SHARED = yes; then @@ -4632,62 +4386,6 @@ fi echo "${ECHO_T}$result" >&6; } - enablestring=disable - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; } - # Check whether --enable-optimise was given. -if test "${enable_optimise+set}" = set; then - enableval=$enable_optimise; - if test "$enableval" = yes; then - wx_cv_use_optimise='wxUSE_OPTIMISE=yes' - else - wx_cv_use_optimise='wxUSE_OPTIMISE=no' - fi - cache=yes - -else - - LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" - -fi - - - eval "$wx_cv_use_optimise" - if test "x$cache" = xyes; then - echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_OPTIMISE = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_OPTIMISE - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval= if test -z "$defaultval"; then @@ -4708,27 +4406,15 @@ if test "${enable_debug+set}" = set; then else wx_cv_use_debug='wxUSE_DEBUG=no' fi - cache=yes else - LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" fi eval "$wx_cv_use_debug" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG = yes; then @@ -4764,27 +4450,15 @@ if test "${enable_stl+set}" = set; then else wx_cv_use_stl='wxUSE_STL=no' fi - cache=yes else - LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" fi eval "$wx_cv_use_stl" - if test "x$cache" = xyes; then - echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STL = yes; then @@ -4820,27 +4494,15 @@ if test "${enable_std_iostreams+set}" = set; then else wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' fi - cache=yes else - LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" fi eval "$wx_cv_use_std_iostreams" - if test "x$cache" = xyes; then - echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STD_IOSTREAM = yes; then @@ -4876,27 +4538,15 @@ if test "${enable_std_string+set}" = set; then else wx_cv_use_std_string='wxUSE_STD_STRING=no' fi - cache=yes else - LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" fi eval "$wx_cv_use_std_string" - if test "x$cache" = xyes; then - echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STD_STRING = yes; then @@ -4932,27 +4582,15 @@ if test "${enable_unicode+set}" = set; then else wx_cv_use_unicode='wxUSE_UNICODE=no' fi - cache=yes else - LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" fi eval "$wx_cv_use_unicode" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE = yes; then @@ -4988,27 +4626,15 @@ if test "${enable_mslu+set}" = set; then else wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no' fi - cache=yes else - LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" fi eval "$wx_cv_use_mslu" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE_MSLU = yes; then @@ -5031,27 +4657,15 @@ echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; } if test "${enable_utf8+set}" = set; then enableval=$enable_utf8; wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" - cache=yes else - LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 fi eval "$wx_cv_use_utf8" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp - fi { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } @@ -5077,27 +4691,15 @@ if test "${enable_utf8only+set}" = set; then else wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' fi - cache=yes else - LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" fi eval "$wx_cv_use_utf8only" - if test "x$cache" = xyes; then - echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then @@ -5133,27 +4735,15 @@ if test "${enable_extended_rtti+set}" = set; then else wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' fi - cache=yes else - LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" fi eval "$wx_cv_use_extended_rtti" - if test "x$cache" = xyes; then - echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EXTENDED_RTTI = yes; then @@ -5168,7 +4758,7 @@ fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } -if test "$USE_OS2" = "1"; then +if test "$USE_OS2" = 1; then DEFAULT_wxUSE_OMF=no enablestring= @@ -5191,27 +4781,15 @@ if test "${enable_omf+set}" = set; then else wx_cv_use_omf='wxUSE_OMF=no' fi - cache=yes else - LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" fi eval "$wx_cv_use_omf" - if test "x$cache" = xyes; then - echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OMF = yes; then @@ -5229,13 +4807,13 @@ echo "${ECHO_T}$result" >&6; } fi if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_DEBUG_FLAG=yes - DEFAULT_wxUSE_DEBUG_INFO=yes - BUILD=debug + DEFAULT_wxUSE_DEBUG_FLAG=yes + DEFAULT_wxUSE_DEBUG_INFO=yes + BUILD=debug elif test "$wxUSE_DEBUG" = "no"; then - DEFAULT_wxUSE_DEBUG_FLAG=no - DEFAULT_wxUSE_DEBUG_INFO=no - BUILD=release + DEFAULT_wxUSE_DEBUG_FLAG=no + DEFAULT_wxUSE_DEBUG_INFO=no + BUILD=release fi @@ -5259,27 +4837,15 @@ if test "${enable_debug_flag+set}" = set; then else wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' fi - cache=yes else - LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" fi eval "$wx_cv_use_debug_flag" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_FLAG = yes; then @@ -5315,27 +4881,15 @@ if test "${enable_debug_info+set}" = set; then else wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' fi - cache=yes else - LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" fi eval "$wx_cv_use_debug_info" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_INFO = yes; then @@ -5351,6 +4905,61 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then + wxUSE_DEBUG=yes + BUILD=debug +fi + +if test "$wxUSE_DEBUG" = "yes"; then + DEFAULT_wxUSE_OPTIMISE=no +fi + + + enablestring=disable + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; } + # Check whether --enable-optimise was given. +if test "${enable_optimise+set}" = set; then + enableval=$enable_optimise; + if test "$enableval" = yes; then + wx_cv_use_optimise='wxUSE_OPTIMISE=yes' + else + wx_cv_use_optimise='wxUSE_OPTIMISE=no' + fi + +else + + wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" + +fi + + + eval "$wx_cv_use_optimise" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OPTIMISE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OPTIMISE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= defaultval= if test -z "$defaultval"; then @@ -5371,27 +4980,15 @@ if test "${enable_debug_gdb+set}" = set; then else wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' fi - cache=yes else - LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" fi eval "$wx_cv_use_debug_gdb" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_GDB = yes; then @@ -5427,27 +5024,15 @@ if test "${enable_debug_cntxt+set}" = set; then else wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' fi - cache=yes else - LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" fi eval "$wx_cv_use_debug_cntxt" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUG_CONTEXT = yes; then @@ -5483,27 +5068,15 @@ if test "${enable_mem_tracing+set}" = set; then 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" - cache=yes - else - cache=no - fi - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" fi eval "$wx_cv_use_mem_tracing" - if test "x$cache" = xyes; then - echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MEM_TRACING = yes; then @@ -5539,27 +5112,15 @@ if test "${enable_profile+set}" = set; then else wx_cv_use_profile='wxUSE_PROFILE=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" fi eval "$wx_cv_use_profile" - if test "x$cache" = xyes; then - echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROFILE = yes; then @@ -5595,27 +5156,15 @@ if test "${enable_no_rtti+set}" = set; then else wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' fi - cache=yes else - LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" fi eval "$wx_cv_use_no_rtti" - if test "x$cache" = xyes; then - echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_RTTI = yes; then @@ -5651,27 +5200,15 @@ if test "${enable_no_exceptions+set}" = set; then else wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' fi - cache=yes else - LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" fi eval "$wx_cv_use_no_exceptions" - if test "x$cache" = xyes; then - echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_EXCEPTIONS = yes; then @@ -5707,27 +5244,15 @@ if test "${enable_permissive+set}" = set; then else wx_cv_use_permissive='wxUSE_PERMISSIVE=no' fi - cache=yes else - LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" fi eval "$wx_cv_use_permissive" - if test "x$cache" = xyes; then - echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PERMISSIVE = yes; then @@ -5763,27 +5288,15 @@ if test "${enable_no_deps+set}" = set; then else wx_cv_use_no_deps='wxUSE_NO_DEPS=no' fi - cache=yes else - LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" fi eval "$wx_cv_use_no_deps" - if test "x$cache" = xyes; then - echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NO_DEPS = yes; then @@ -5819,27 +5332,15 @@ if test "${enable_vararg_macros+set}" = set; then else wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' fi - cache=yes else - LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" fi eval "$wx_cv_use_vararg_macros" - if test "x$cache" = xyes; then - echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VARARG_MACROS = yes; then @@ -5862,27 +5363,15 @@ echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C if test "${enable_universal_binary+set}" = set; then enableval=$enable_universal_binary; wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" - cache=yes else - LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY fi eval "$wx_cv_use_universal_binary" - if test "x$cache" = xyes; then - echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp - fi { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } @@ -5909,27 +5398,15 @@ if test "${enable_compat26+set}" = set; then else wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' fi - cache=yes else - LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" fi eval "$wx_cv_use_compat26" - if test "x$cache" = xyes; then - echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $WXWIN_COMPATIBILITY_2_6 = yes; then @@ -5965,27 +5442,15 @@ if test "${enable_compat28+set}" = set; then else wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' fi - cache=yes else - LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" fi eval "$wx_cv_use_compat28" - if test "x$cache" = xyes; then - echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $WXWIN_COMPATIBILITY_2_8 = yes; then @@ -6022,27 +5487,15 @@ if test "${enable_rpath+set}" = set; then else wx_cv_use_rpath='wxUSE_RPATH=no' fi - cache=yes else - LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" fi eval "$wx_cv_use_rpath" - if test "x$cache" = xyes; then - echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RPATH = yes; then @@ -6079,27 +5532,15 @@ if test "${enable_objc_uniquifying+set}" = set; then else wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' fi - cache=yes else - LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" fi eval "$wx_cv_use_objc_uniquifying" - if test "x$cache" = xyes; then - echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OBJC_UNIQUIFYING = yes; then @@ -6136,27 +5577,15 @@ if test "${enable_visibility+set}" = set; then else wx_cv_use_visibility='wxUSE_VISIBILITY=no' fi - cache=yes else - LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" fi eval "$wx_cv_use_visibility" - if test "x$cache" = xyes; then - echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VISIBILITY = yes; then @@ -6194,27 +5623,15 @@ if test "${enable_intl+set}" = set; then else wx_cv_use_intl='wxUSE_INTL=no' fi - cache=yes else - LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" fi eval "$wx_cv_use_intl" - if test "x$cache" = xyes; then - echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_INTL = yes; then @@ -6230,6 +5647,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xlocale" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-xlocale... $ECHO_C" >&6; } + # Check whether --enable-xlocale was given. +if test "${enable_xlocale+set}" = set; then + enableval=$enable_xlocale; + if test "$enableval" = yes; then + wx_cv_use_xlocale='wxUSE_XLOCALE=yes' + else + wx_cv_use_xlocale='wxUSE_XLOCALE=no' + fi + +else + + wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}" + +fi + + + eval "$wx_cv_use_xlocale" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_XLOCALE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_XLOCALE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6250,27 +5711,15 @@ if test "${enable_config+set}" = set; then else wx_cv_use_config='wxUSE_CONFIG=no' fi - cache=yes else - LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" fi eval "$wx_cv_use_config" - if test "x$cache" = xyes; then - echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONFIG = yes; then @@ -6307,27 +5756,15 @@ if test "${enable_protocols+set}" = set; then else wx_cv_use_protocols='wxUSE_PROTOCOL=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi eval "$wx_cv_use_protocols" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL = yes; then @@ -6363,27 +5800,15 @@ if test "${enable_ftp+set}" = set; then else wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi eval "$wx_cv_use_ftp" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FTP = yes; then @@ -6419,27 +5844,15 @@ if test "${enable_http+set}" = set; then else wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi eval "$wx_cv_use_http" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_HTTP = yes; then @@ -6475,27 +5888,15 @@ if test "${enable_fileproto+set}" = set; then else wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi eval "$wx_cv_use_fileproto" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FILE = yes; then @@ -6531,27 +5932,15 @@ if test "${enable_sockets+set}" = set; then else wx_cv_use_sockets='wxUSE_SOCKETS=no' fi - cache=yes else - LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" fi eval "$wx_cv_use_sockets" - if test "x$cache" = xyes; then - echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SOCKETS = yes; then @@ -6567,6 +5956,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipv6" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ipv6... $ECHO_C" >&6; } + # Check whether --enable-ipv6 was given. +if test "${enable_ipv6+set}" = set; then + enableval=$enable_ipv6; + if test "$enableval" = yes; then + wx_cv_use_ipv6='wxUSE_IPV6=yes' + else + wx_cv_use_ipv6='wxUSE_IPV6=no' + fi + +else + + wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}" + +fi + + + eval "$wx_cv_use_ipv6" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_IPV6 = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_IPV6 + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -6587,27 +6020,15 @@ if test "${enable_ole+set}" = set; then else wx_cv_use_ole='wxUSE_OLE=no' fi - cache=yes else - LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" fi eval "$wx_cv_use_ole" - if test "x$cache" = xyes; then - echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_OLE = yes; then @@ -6643,27 +6064,15 @@ if test "${enable_dataobj+set}" = set; then else wx_cv_use_dataobj='wxUSE_DATAOBJ=no' fi - cache=yes else - LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" fi eval "$wx_cv_use_dataobj" - if test "x$cache" = xyes; then - echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATAOBJ = yes; then @@ -6700,27 +6109,15 @@ if test "${enable_ipc+set}" = set; then else wx_cv_use_ipc='wxUSE_IPC=no' fi - cache=yes else - LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" fi eval "$wx_cv_use_ipc" - if test "x$cache" = xyes; then - echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IPC = yes; then @@ -6757,27 +6154,15 @@ if test "${enable_baseevtloop+set}" = set; then else wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' fi - cache=yes else - LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" fi eval "$wx_cv_use_baseevtloop" - if test "x$cache" = xyes; then - echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONSOLE_EVENTLOOP = yes; then @@ -6813,27 +6198,15 @@ if test "${enable_epollloop+set}" = set; then else wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' fi - cache=yes else - LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" fi 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 x"$enablestring" = xdisable; then if test $wxUSE_EPOLL_DISPATCHER = yes; then @@ -6869,27 +6242,15 @@ if test "${enable_selectloop+set}" = set; then else wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' fi - cache=yes else - LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" fi eval "$wx_cv_use_selectloop" - if test "x$cache" = xyes; then - echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SELECT_DISPATCHER = yes; then @@ -6926,27 +6287,15 @@ if test "${enable_apple_ieee+set}" = set; then else wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' fi - cache=yes else - LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" fi eval "$wx_cv_use_apple_ieee" - if test "x$cache" = xyes; then - echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_APPLE_IEEE = yes; then @@ -6982,27 +6331,15 @@ if test "${enable_arcstream+set}" = set; then else wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' fi - cache=yes else - LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" fi eval "$wx_cv_use_arcstream" - if test "x$cache" = xyes; then - echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ARCHIVE_STREAMS = yes; then @@ -7038,27 +6375,15 @@ if test "${enable_base64+set}" = set; then else wx_cv_use_base64='wxUSE_BASE64=no' fi - cache=yes else - LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" fi eval "$wx_cv_use_base64" - if test "x$cache" = xyes; then - echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BASE64 = yes; then @@ -7094,27 +6419,15 @@ if test "${enable_backtrace+set}" = set; then else wx_cv_use_backtrace='wxUSE_STACKWALKER=no' fi - cache=yes else - LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" fi eval "$wx_cv_use_backtrace" - if test "x$cache" = xyes; then - echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STACKWALKER = yes; then @@ -7150,27 +6463,15 @@ if test "${enable_catch_segvs+set}" = set; then else wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' fi - cache=yes else - LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" fi eval "$wx_cv_use_catch_segvs" - if test "x$cache" = xyes; then - echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ON_FATAL_EXCEPTION = yes; then @@ -7206,27 +6507,15 @@ if test "${enable_cmdline+set}" = set; then else wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' fi - cache=yes else - LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" fi eval "$wx_cv_use_cmdline" - if test "x$cache" = xyes; then - echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CMDLINE_PARSER = yes; then @@ -7262,27 +6551,15 @@ if test "${enable_datetime+set}" = set; then else wx_cv_use_datetime='wxUSE_DATETIME=no' fi - cache=yes else - LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" fi eval "$wx_cv_use_datetime" - if test "x$cache" = xyes; then - echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATETIME = yes; then @@ -7318,27 +6595,15 @@ if test "${enable_debugreport+set}" = set; then else wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' fi - cache=yes else - LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" fi eval "$wx_cv_use_debugreport" - if test "x$cache" = xyes; then - echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DEBUGREPORT = yes; then @@ -7374,27 +6639,15 @@ if test "${enable_dialupman+set}" = set; then else wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' fi - cache=yes else - LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" fi eval "$wx_cv_use_dialupman" - if test "x$cache" = xyes; then - echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIALUP_MANAGER = yes; then @@ -7430,27 +6683,15 @@ if test "${enable_dynlib+set}" = set; then else wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' fi - cache=yes else - LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" fi eval "$wx_cv_use_dynlib" - if test "x$cache" = xyes; then - echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DYNLIB_CLASS = yes; then @@ -7486,27 +6727,15 @@ if test "${enable_dynamicloader+set}" = set; then else wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' fi - cache=yes else - LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" fi eval "$wx_cv_use_dynamicloader" - if test "x$cache" = xyes; then - echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DYNAMIC_LOADER = yes; then @@ -7542,27 +6771,15 @@ if test "${enable_exceptions+set}" = set; then else wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' fi - cache=yes else - LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" fi eval "$wx_cv_use_exceptions" - if test "x$cache" = xyes; then - echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EXCEPTIONS = yes; then @@ -7598,27 +6815,15 @@ if test "${enable_ffile+set}" = set; then else wx_cv_use_ffile='wxUSE_FFILE=no' fi - cache=yes else - LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" fi eval "$wx_cv_use_ffile" - if test "x$cache" = xyes; then - echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FFILE = yes; then @@ -7654,27 +6859,15 @@ if test "${enable_file+set}" = set; then else wx_cv_use_file='wxUSE_FILE=no' fi - cache=yes else - LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" fi eval "$wx_cv_use_file" - if test "x$cache" = xyes; then - echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILE = yes; then @@ -7710,27 +6903,15 @@ if test "${enable_filesystem+set}" = set; then else wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' fi - cache=yes else - LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" fi eval "$wx_cv_use_filesystem" - if test "x$cache" = xyes; then - echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILESYSTEM = yes; then @@ -7766,27 +6947,15 @@ if test "${enable_fontenum+set}" = set; then else wx_cv_use_fontenum='wxUSE_FONTENUM=no' fi - cache=yes else - LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" fi eval "$wx_cv_use_fontenum" - if test "x$cache" = xyes; then - echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTENUM = yes; then @@ -7822,27 +6991,15 @@ if test "${enable_fontmap+set}" = set; then else wx_cv_use_fontmap='wxUSE_FONTMAP=no' fi - cache=yes else - LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" fi eval "$wx_cv_use_fontmap" - if test "x$cache" = xyes; then - echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTMAP = yes; then @@ -7878,27 +7035,15 @@ if test "${enable_fs_archive+set}" = set; then else wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' fi - cache=yes else - LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" fi eval "$wx_cv_use_fs_archive" - if test "x$cache" = xyes; then - echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_ARCHIVE = yes; then @@ -7934,27 +7079,15 @@ if test "${enable_fs_inet+set}" = set; then else wx_cv_use_fs_inet='wxUSE_FS_INET=no' fi - cache=yes else - LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" fi eval "$wx_cv_use_fs_inet" - if test "x$cache" = xyes; then - echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_INET = yes; then @@ -7990,27 +7123,15 @@ if test "${enable_fs_zip+set}" = set; then else wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' fi - cache=yes else - LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" fi eval "$wx_cv_use_fs_zip" - if test "x$cache" = xyes; then - echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FS_ZIP = yes; then @@ -8046,27 +7167,15 @@ if test "${enable_geometry+set}" = set; then else wx_cv_use_geometry='wxUSE_GEOMETRY=no' fi - cache=yes else - LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" fi eval "$wx_cv_use_geometry" - if test "x$cache" = xyes; then - echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GEOMETRY = yes; then @@ -8102,27 +7211,15 @@ if test "${enable_log+set}" = set; then else wx_cv_use_log='wxUSE_LOG=no' fi - cache=yes else - LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" fi eval "$wx_cv_use_log" - if test "x$cache" = xyes; then - echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LOG = yes; then @@ -8158,27 +7255,15 @@ if test "${enable_longlong+set}" = set; then else wx_cv_use_longlong='wxUSE_LONGLONG=no' fi - cache=yes else - LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" fi eval "$wx_cv_use_longlong" - if test "x$cache" = xyes; then - echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LONGLONG = yes; then @@ -8214,27 +7299,15 @@ if test "${enable_mimetype+set}" = set; then else wx_cv_use_mimetype='wxUSE_MIMETYPE=no' fi - cache=yes else - LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" fi eval "$wx_cv_use_mimetype" - if test "x$cache" = xyes; then - echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MIMETYPE = yes; then @@ -8250,6 +7323,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; } + # Check whether --enable-printfposparam was given. +if test "${enable_printfposparam+set}" = set; then + enableval=$enable_printfposparam; + if test "$enableval" = yes; then + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' + else + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' + fi + +else + + wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" + +fi + + + eval "$wx_cv_use_printfposparam" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTF_POS_PARAMS = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PRINTF_POS_PARAMS + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -8270,27 +7387,15 @@ if test "${enable_snglinst+set}" = set; then else wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' fi - cache=yes else - LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" fi eval "$wx_cv_use_snglinst" - if test "x$cache" = xyes; then - echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SNGLINST_CHECKER = yes; then @@ -8306,6 +7411,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; } + # Check whether --enable-sound was given. +if test "${enable_sound+set}" = set; then + enableval=$enable_sound; + if test "$enableval" = yes; then + wx_cv_use_sound='wxUSE_SOUND=yes' + else + wx_cv_use_sound='wxUSE_SOUND=no' + fi + +else + + wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" + +fi + + + eval "$wx_cv_use_sound" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_SOUND = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_SOUND + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -8326,27 +7475,15 @@ if test "${enable_stdpaths+set}" = set; then else wx_cv_use_stdpaths='wxUSE_STDPATHS=no' fi - cache=yes else - LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" fi eval "$wx_cv_use_stdpaths" - if test "x$cache" = xyes; then - echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STDPATHS = yes; then @@ -8382,27 +7519,15 @@ if test "${enable_stopwatch+set}" = set; then else wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' fi - cache=yes else - LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" fi eval "$wx_cv_use_stopwatch" - if test "x$cache" = xyes; then - echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STOPWATCH = yes; then @@ -8438,27 +7563,15 @@ if test "${enable_streams+set}" = set; then else wx_cv_use_streams='wxUSE_STREAMS=no' fi - cache=yes else - LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" fi eval "$wx_cv_use_streams" - if test "x$cache" = xyes; then - echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STREAMS = yes; then @@ -8494,27 +7607,15 @@ if test "${enable_system_options+set}" = set; then else wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' fi - cache=yes else - LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" fi eval "$wx_cv_use_system_options" - if test "x$cache" = xyes; then - echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SYSTEM_OPTIONS = yes; then @@ -8550,27 +7651,15 @@ if test "${enable_tarstream+set}" = set; then else wx_cv_use_tarstream='wxUSE_TARSTREAM=no' fi - cache=yes else - LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" fi eval "$wx_cv_use_tarstream" - if test "x$cache" = xyes; then - echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TARSTREAM = yes; then @@ -8606,27 +7695,15 @@ if test "${enable_textbuf+set}" = set; then else wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' fi - cache=yes else - LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" fi eval "$wx_cv_use_textbuf" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTBUFFER = yes; then @@ -8662,27 +7739,15 @@ if test "${enable_textfile+set}" = set; then else wx_cv_use_textfile='wxUSE_TEXTFILE=no' fi - cache=yes else - LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" fi eval "$wx_cv_use_textfile" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTFILE = yes; then @@ -8718,27 +7783,15 @@ if test "${enable_timer+set}" = set; then else wx_cv_use_timer='wxUSE_TIMER=no' fi - cache=yes else - LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" fi eval "$wx_cv_use_timer" - if test "x$cache" = xyes; then - echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TIMER = yes; then @@ -8764,214 +7817,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; } - # Check whether --enable-sound was given. -if test "${enable_sound+set}" = set; then - enableval=$enable_sound; - if test "$enableval" = yes; then - wx_cv_use_sound='wxUSE_SOUND=yes' - else - wx_cv_use_sound='wxUSE_SOUND=no' - fi - cache=yes - -else - - LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" - -fi - - - eval "$wx_cv_use_sound" - if test "x$cache" = xyes; then - echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_SOUND = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_SOUND - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; } - # Check whether --enable-mediactrl was given. -if test "${enable_mediactrl+set}" = set; then - enableval=$enable_mediactrl; - if test "$enableval" = yes; then - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' - else - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' - fi - cache=yes - -else - - LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" - -fi - - - eval "$wx_cv_use_mediactrl" - if test "x$cache" = xyes; then - echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_MEDIACTRL = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_MEDIACTRL - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; } - # Check whether --enable-gstreamer8 was given. -if test "${enable_gstreamer8+set}" = set; then - enableval=$enable_gstreamer8; - if test "$enableval" = yes; then - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' - else - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' - fi - cache=yes - -else - - LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" - -fi - - - eval "$wx_cv_use_gstreamer8" - if test "x$cache" = xyes; then - echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_GSTREAMER8 = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_GSTREAMER8 - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; } - # Check whether --enable-printfposparam was given. -if test "${enable_printfposparam+set}" = set; then - enableval=$enable_printfposparam; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; } + # Check whether --enable-variant was given. +if test "${enable_variant+set}" = set; then + enableval=$enable_variant; if test "$enableval" = yes; then - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes' + wx_cv_use_variant='wxUSE_VARIANT=yes' else - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' + wx_cv_use_variant='wxUSE_VARIANT=no' fi - cache=yes else - LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" + wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" fi - eval "$wx_cv_use_printfposparam" - if test "x$cache" = xyes; then - echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_variant" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTF_POS_PARAMS = yes; then + if test $wxUSE_VARIANT = yes; then result=no else result=yes fi else - result=$wxUSE_PRINTF_POS_PARAMS + result=$wxUSE_VARIANT fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -8998,27 +7871,15 @@ if test "${enable_zipstream+set}" = set; then else wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' fi - cache=yes else - LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" fi eval "$wx_cv_use_zipstream" - if test "x$cache" = xyes; then - echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ZIPSTREAM = yes; then @@ -9055,27 +7916,15 @@ if test "${enable_url+set}" = set; then else wx_cv_use_url='wxUSE_URL=no' fi - cache=yes else - LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" fi eval "$wx_cv_use_url" - if test "x$cache" = xyes; then - echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_URL = yes; then @@ -9091,62 +7940,6 @@ fi echo "${ECHO_T}$result" >&6; } - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; } - # Check whether --enable-variant was given. -if test "${enable_variant+set}" = set; then - enableval=$enable_variant; - if test "$enableval" = yes; then - wx_cv_use_variant='wxUSE_VARIANT=yes' - else - wx_cv_use_variant='wxUSE_VARIANT=no' - fi - cache=yes - -else - - LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" - -fi - - - eval "$wx_cv_use_variant" - if test "x$cache" = xyes; then - echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_VARIANT = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_VARIANT - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9167,27 +7960,15 @@ if test "${enable_protocol+set}" = set; then else wx_cv_use_protocol='wxUSE_PROTOCOL=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" fi eval "$wx_cv_use_protocol" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL = yes; then @@ -9223,27 +8004,15 @@ if test "${enable_protocol_http+set}" = set; then else wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" fi eval "$wx_cv_use_protocol_http" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_HTTP = yes; then @@ -9279,27 +8048,15 @@ if test "${enable_protocol_ftp+set}" = set; then else wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" fi eval "$wx_cv_use_protocol_ftp" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FTP = yes; then @@ -9335,27 +8092,15 @@ if test "${enable_protocol_file+set}" = set; then else wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" fi eval "$wx_cv_use_protocol_file" - if test "x$cache" = xyes; then - echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROTOCOL_FILE = yes; then @@ -9392,27 +8137,15 @@ if test "${enable_threads+set}" = set; then else wx_cv_use_threads='wxUSE_THREADS=no' fi - cache=yes else - LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" fi eval "$wx_cv_use_threads" - if test "x$cache" = xyes; then - echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_THREADS = yes; then @@ -9449,27 +8182,15 @@ if test "${enable_iniconf+set}" = set; then else wx_cv_use_iniconf='wxUSE_INICONF=no' fi - cache=yes else - LINE=`grep "^wxUSE_INICONF=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_iniconf='wxUSE_INICONF=${'DEFAULT_wxUSE_INICONF":-$defaultval}" fi eval "$wx_cv_use_iniconf" - if test "x$cache" = xyes; then - echo "wxUSE_INICONF=$wxUSE_INICONF" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_INICONF = yes; then @@ -9505,27 +8226,15 @@ if test "${enable_regkey+set}" = set; then else wx_cv_use_regkey='wxUSE_REGKEY=no' fi - cache=yes else - LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" fi eval "$wx_cv_use_regkey" - if test "x$cache" = xyes; then - echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_REGKEY = yes; then @@ -9565,27 +8274,15 @@ if test "${enable_docview+set}" = set; then else wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' fi - cache=yes else - LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" fi eval "$wx_cv_use_docview" - if test "x$cache" = xyes; then - echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then @@ -9621,27 +8318,15 @@ if test "${enable_help+set}" = set; then else wx_cv_use_help='wxUSE_HELP=no' fi - cache=yes else - LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" fi eval "$wx_cv_use_help" - if test "x$cache" = xyes; then - echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HELP = yes; then @@ -9677,27 +8362,15 @@ if test "${enable_mshtmlhelp+set}" = set; then else wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' fi - cache=yes else - LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" fi eval "$wx_cv_use_mshtmlhelp" - if test "x$cache" = xyes; then - echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MS_HTML_HELP = yes; then @@ -9733,27 +8406,15 @@ if test "${enable_html+set}" = set; then else wx_cv_use_html='wxUSE_HTML=no' fi - cache=yes else - LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" fi eval "$wx_cv_use_html" - if test "x$cache" = xyes; then - echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HTML = yes; then @@ -9789,27 +8450,15 @@ if test "${enable_htmlhelp+set}" = set; then else wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' fi - cache=yes else - LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" fi eval "$wx_cv_use_htmlhelp" - if test "x$cache" = xyes; then - echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WXHTML_HELP = yes; then @@ -9845,27 +8494,15 @@ if test "${enable_xrc+set}" = set; then else wx_cv_use_xrc='wxUSE_XRC=no' fi - cache=yes else - LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" fi eval "$wx_cv_use_xrc" - if test "x$cache" = xyes; then - echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_XRC = yes; then @@ -9901,27 +8538,15 @@ if test "${enable_aui+set}" = set; then else wx_cv_use_aui='wxUSE_AUI=no' fi - cache=yes else - LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" fi eval "$wx_cv_use_aui" - if test "x$cache" = xyes; then - echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_AUI = yes; then @@ -9937,6 +8562,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-propgrid" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-propgrid... $ECHO_C" >&6; } + # Check whether --enable-propgrid was given. +if test "${enable_propgrid+set}" = set; then + enableval=$enable_propgrid; + if test "$enableval" = yes; then + wx_cv_use_propgrid='wxUSE_PROPGRID=yes' + else + wx_cv_use_propgrid='wxUSE_PROPGRID=no' + fi + +else + + wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}" + +fi + + + eval "$wx_cv_use_propgrid" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PROPGRID = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PROPGRID + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9957,27 +8626,15 @@ if test "${enable_stc+set}" = set; then else wx_cv_use_stc='wxUSE_STC=no' fi - cache=yes else - LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" fi eval "$wx_cv_use_stc" - if test "x$cache" = xyes; then - echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STC = yes; then @@ -10013,27 +8670,15 @@ if test "${enable_constraints+set}" = set; then else wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' fi - cache=yes else - LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" fi eval "$wx_cv_use_constraints" - if test "x$cache" = xyes; then - echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONSTRAINTS = yes; then @@ -10059,46 +8704,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; } - # Check whether --enable-printarch was given. -if test "${enable_printarch+set}" = set; then - enableval=$enable_printarch; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; } + # Check whether --enable-loggui was given. +if test "${enable_loggui+set}" = set; then + enableval=$enable_loggui; if test "$enableval" = yes; then - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + wx_cv_use_loggui='wxUSE_LOGGUI=yes' else - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + wx_cv_use_loggui='wxUSE_LOGGUI=no' fi - cache=yes else - LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" + wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" fi - eval "$wx_cv_use_printarch" - if test "x$cache" = xyes; then - echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_loggui" if test x"$enablestring" = xdisable; then - if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + if test $wxUSE_LOGGUI = yes; then result=no else result=yes fi else - result=$wxUSE_PRINTING_ARCHITECTURE + result=$wxUSE_LOGGUI fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10115,46 +8748,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } - # Check whether --enable-mdi was given. -if test "${enable_mdi+set}" = set; then - enableval=$enable_mdi; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; } + # Check whether --enable-logwin was given. +if test "${enable_logwin+set}" = set; then + enableval=$enable_logwin; if test "$enableval" = yes; then - wx_cv_use_mdi='wxUSE_MDI=yes' + wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' else - wx_cv_use_mdi='wxUSE_MDI=no' + wx_cv_use_logwin='wxUSE_LOGWINDOW=no' fi - cache=yes else - LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" + wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" fi - eval "$wx_cv_use_mdi" - if test "x$cache" = xyes; then - echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_logwin" if test x"$enablestring" = xdisable; then - if test $wxUSE_MDI = yes; then + if test $wxUSE_LOGWINDOW = yes; then result=no else result=yes fi else - result=$wxUSE_MDI + result=$wxUSE_LOGWINDOW fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10171,46 +8792,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } - # Check whether --enable-mdidoc was given. -if test "${enable_mdidoc+set}" = set; then - enableval=$enable_mdidoc; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; } + # Check whether --enable-logdialog was given. +if test "${enable_logdialog+set}" = set; then + enableval=$enable_logdialog; if test "$enableval" = yes; then - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' else - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' + wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' fi - cache=yes else - LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" + wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" fi - eval "$wx_cv_use_mdidoc" - if test "x$cache" = xyes; then - echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_logdialog" if test x"$enablestring" = xdisable; then - if test $wxUSE_MDI_ARCHITECTURE = yes; then + if test $wxUSE_LOGDIALOG = yes; then result=no else result=yes fi else - result=$wxUSE_MDI_ARCHITECTURE + result=$wxUSE_LOGDIALOG fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10227,46 +8836,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; } - # Check whether --enable-loggui was given. -if test "${enable_loggui+set}" = set; then - enableval=$enable_loggui; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } + # Check whether --enable-mdi was given. +if test "${enable_mdi+set}" = set; then + enableval=$enable_mdi; if test "$enableval" = yes; then - wx_cv_use_loggui='wxUSE_LOGGUI=yes' + wx_cv_use_mdi='wxUSE_MDI=yes' else - wx_cv_use_loggui='wxUSE_LOGGUI=no' + wx_cv_use_mdi='wxUSE_MDI=no' fi - cache=yes else - LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" + wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" fi - eval "$wx_cv_use_loggui" - if test "x$cache" = xyes; then - echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_mdi" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGGUI = yes; then + if test $wxUSE_MDI = yes; then result=no else result=yes fi else - result=$wxUSE_LOGGUI + result=$wxUSE_MDI fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10283,46 +8880,34 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; } - # Check whether --enable-logwin was given. -if test "${enable_logwin+set}" = set; then - enableval=$enable_logwin; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } + # Check whether --enable-mdidoc was given. +if test "${enable_mdidoc+set}" = set; then + enableval=$enable_mdidoc; if test "$enableval" = yes; then - wx_cv_use_logwin='wxUSE_LOGWINDOW=yes' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes' else - wx_cv_use_logwin='wxUSE_LOGWINDOW=no' + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' fi - cache=yes else - LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - - wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" + wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" fi - eval "$wx_cv_use_logwin" - if test "x$cache" = xyes; then - echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_mdidoc" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGWINDOW = yes; then + if test $wxUSE_MDI_ARCHITECTURE = yes; then result=no else result=yes fi else - result=$wxUSE_LOGWINDOW + result=$wxUSE_MDI_ARCHITECTURE fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10339,46 +8924,78 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; } - # Check whether --enable-logdialog was given. -if test "${enable_logdialog+set}" = set; then - enableval=$enable_logdialog; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; } + # Check whether --enable-mediactrl was given. +if test "${enable_mediactrl+set}" = set; then + enableval=$enable_mediactrl; if test "$enableval" = yes; then - wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes' else - wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes + wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_mediactrl" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_MEDIACTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_MEDIACTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; } + # Check whether --enable-gstreamer8 was given. +if test "${enable_gstreamer8+set}" = set; then + enableval=$enable_gstreamer8; + if test "$enableval" = yes; then + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes' else - cache=no + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' fi - wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" +else + + wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" fi - eval "$wx_cv_use_logdialog" - if test "x$cache" = xyes; then - echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp - fi + eval "$wx_cv_use_gstreamer8" if test x"$enablestring" = xdisable; then - if test $wxUSE_LOGDIALOG = yes; then + if test $wxUSE_GSTREAMER8 = yes; then result=no else result=yes fi else - result=$wxUSE_LOGDIALOG + result=$wxUSE_GSTREAMER8 fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -10405,27 +9022,15 @@ if test "${enable_webkit+set}" = set; then else wx_cv_use_webkit='wxUSE_WEBKIT=no' fi - cache=yes else - LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" fi eval "$wx_cv_use_webkit" - if test "x$cache" = xyes; then - echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WEBKIT = yes; then @@ -10461,27 +9066,15 @@ if test "${enable_richtext+set}" = set; then else wx_cv_use_richtext='wxUSE_RICHTEXT=no' fi - cache=yes else - LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" fi eval "$wx_cv_use_richtext" - if test "x$cache" = xyes; then - echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RICHTEXT = yes; then @@ -10517,27 +9110,15 @@ if test "${enable_graphics_ctx+set}" = set; then else wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' fi - cache=yes else - LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" fi eval "$wx_cv_use_graphics_ctx" - if test "x$cache" = xyes; then - echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GRAPHICS_CONTEXT = yes; then @@ -10573,27 +9154,15 @@ if test "${enable_postscript+set}" = set; then else wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi - cache=yes else - LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" fi eval "$wx_cv_use_postscript" - if test "x$cache" = xyes; then - echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_POSTSCRIPT = yes; then @@ -10609,6 +9178,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; } + # Check whether --enable-printarch was given. +if test "${enable_printarch+set}" = set; then + enableval=$enable_printarch; + if test "$enableval" = yes; then + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes' + else + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' + fi + +else + + wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" + +fi + + + eval "$wx_cv_use_printarch" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PRINTING_ARCHITECTURE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_PRINTING_ARCHITECTURE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -10629,27 +9242,15 @@ if test "${enable_svg+set}" = set; then else wx_cv_use_svg='wxUSE_SVG=no' fi - cache=yes else - LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" fi eval "$wx_cv_use_svg" - if test "x$cache" = xyes; then - echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SVG = yes; then @@ -10687,27 +9288,15 @@ if test "${enable_clipboard+set}" = set; then else wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' fi - cache=yes else - LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" fi eval "$wx_cv_use_clipboard" - if test "x$cache" = xyes; then - echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CLIPBOARD = yes; then @@ -10743,27 +9332,15 @@ if test "${enable_dnd+set}" = set; then else wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' fi - cache=yes else - LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" fi eval "$wx_cv_use_dnd" - if test "x$cache" = xyes; then - echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DRAG_AND_DROP = yes; then @@ -10799,27 +9376,15 @@ if test "${enable_metafile+set}" = set; then 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 @@ -10858,27 +9423,15 @@ if test "${enable_controls+set}" = set; then else wx_cv_use_controls='wxUSE_CONTROLS=no' fi - cache=yes else - LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" fi eval "$wx_cv_use_controls" - if test "x$cache" = xyes; then - echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CONTROLS = yes; then @@ -10919,7 +9472,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_HYPERLINKCTRL=yes - DEFAULT_wxUSE_DATAVIEWCTRL=no + DEFAULT_wxUSE_DATAVIEWCTRL=yes DEFAULT_wxUSE_IMAGLIST=yes DEFAULT_wxUSE_LISTBOOK=yes DEFAULT_wxUSE_LISTBOX=yes @@ -11025,27 +9578,15 @@ if test "${enable_accel+set}" = set; then else wx_cv_use_accel='wxUSE_ACCEL=no' fi - cache=yes else - LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" fi eval "$wx_cv_use_accel" - if test "x$cache" = xyes; then - echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ACCEL = yes; then @@ -11081,27 +9622,15 @@ if test "${enable_animatectrl+set}" = set; then else wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" fi eval "$wx_cv_use_animatectrl" - if test "x$cache" = xyes; then - echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ANIMATIONCTRL = yes; then @@ -11137,27 +9666,15 @@ if test "${enable_button+set}" = set; then else wx_cv_use_button='wxUSE_BUTTON=no' fi - cache=yes else - LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" fi eval "$wx_cv_use_button" - if test "x$cache" = xyes; then - echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BUTTON = yes; then @@ -11193,27 +9710,15 @@ if test "${enable_bmpbutton+set}" = set; then else wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi - cache=yes else - LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" fi eval "$wx_cv_use_bmpbutton" - if test "x$cache" = xyes; then - echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BMPBUTTON = yes; then @@ -11249,27 +9754,15 @@ if test "${enable_bmpcombobox+set}" = set; then else wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" fi eval "$wx_cv_use_bmpcombobox" - if test "x$cache" = xyes; then - echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BITMAPCOMBOBOX = yes; then @@ -11305,27 +9798,15 @@ if test "${enable_calendar+set}" = set; then else wx_cv_use_calendar='wxUSE_CALCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" fi eval "$wx_cv_use_calendar" - if test "x$cache" = xyes; then - echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CALCTRL = yes; then @@ -11361,27 +9842,15 @@ if test "${enable_caret+set}" = set; then else wx_cv_use_caret='wxUSE_CARET=no' fi - cache=yes else - LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" fi eval "$wx_cv_use_caret" - if test "x$cache" = xyes; then - echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CARET = yes; then @@ -11417,27 +9886,15 @@ if test "${enable_checkbox+set}" = set; then else wx_cv_use_checkbox='wxUSE_CHECKBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" fi eval "$wx_cv_use_checkbox" - if test "x$cache" = xyes; then - echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHECKBOX = yes; then @@ -11473,27 +9930,15 @@ if test "${enable_checklst+set}" = set; then else wx_cv_use_checklst='wxUSE_CHECKLST=no' fi - cache=yes else - LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" fi eval "$wx_cv_use_checklst" - if test "x$cache" = xyes; then - echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHECKLST = yes; then @@ -11529,27 +9974,15 @@ if test "${enable_choice+set}" = set; then else wx_cv_use_choice='wxUSE_CHOICE=no' fi - cache=yes else - LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" fi eval "$wx_cv_use_choice" - if test "x$cache" = xyes; then - echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICE = yes; then @@ -11585,27 +10018,15 @@ if test "${enable_choicebook+set}" = set; then else wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' fi - cache=yes else - LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" fi eval "$wx_cv_use_choicebook" - if test "x$cache" = xyes; then - echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICEBOOK = yes; then @@ -11641,27 +10062,15 @@ if test "${enable_collpane+set}" = set; then else wx_cv_use_collpane='wxUSE_COLLPANE=no' fi - cache=yes else - LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" fi eval "$wx_cv_use_collpane" - if test "x$cache" = xyes; then - echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLLPANE = yes; then @@ -11697,27 +10106,15 @@ if test "${enable_colourpicker+set}" = set; then else wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_colourpicker" - if test "x$cache" = xyes; then - echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLOURPICKERCTRL = yes; then @@ -11753,27 +10150,15 @@ if test "${enable_combobox+set}" = set; then else wx_cv_use_combobox='wxUSE_COMBOBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" fi eval "$wx_cv_use_combobox" - if test "x$cache" = xyes; then - echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMBOBOX = yes; then @@ -11809,27 +10194,15 @@ if test "${enable_comboctrl+set}" = set; then else wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" fi eval "$wx_cv_use_comboctrl" - if test "x$cache" = xyes; then - echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMBOCTRL = yes; then @@ -11865,27 +10238,15 @@ if test "${enable_datepick+set}" = set; then else wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" fi eval "$wx_cv_use_datepick" - if test "x$cache" = xyes; then - echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATEPICKCTRL = yes; then @@ -11921,27 +10282,15 @@ if test "${enable_dirpicker+set}" = set; then else wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_dirpicker" - if test "x$cache" = xyes; then - echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIRPICKERCTRL = yes; then @@ -11977,27 +10326,15 @@ if test "${enable_display+set}" = set; then else wx_cv_use_display='wxUSE_DISPLAY=no' fi - cache=yes else - LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" fi eval "$wx_cv_use_display" - if test "x$cache" = xyes; then - echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DISPLAY = yes; then @@ -12033,27 +10370,15 @@ if test "${enable_detect_sm+set}" = set; then else wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' fi - cache=yes else - LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" fi eval "$wx_cv_use_detect_sm" - if test "x$cache" = xyes; then - echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DETECT_SM = yes; then @@ -12089,27 +10414,15 @@ if test "${enable_editablebox+set}" = set; then else wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" fi eval "$wx_cv_use_editablebox" - if test "x$cache" = xyes; then - echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_EDITABLELISTBOX = yes; then @@ -12145,27 +10458,15 @@ if test "${enable_filepicker+set}" = set; then else wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_filepicker" - if test "x$cache" = xyes; then - echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILEPICKERCTRL = yes; then @@ -12201,27 +10502,15 @@ if test "${enable_filectrl+set}" = set; then else wx_cv_use_filectrl='wxUSE_FILECTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" fi eval "$wx_cv_use_filectrl" - if test "x$cache" = xyes; then - echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILECTRL = yes; then @@ -12257,27 +10546,15 @@ if test "${enable_fontpicker+set}" = set; then else wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" fi eval "$wx_cv_use_fontpicker" - if test "x$cache" = xyes; then - echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTPICKERCTRL = yes; then @@ -12313,27 +10590,15 @@ if test "${enable_gauge+set}" = set; then else wx_cv_use_gauge='wxUSE_GAUGE=no' fi - cache=yes else - LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" fi eval "$wx_cv_use_gauge" - if test "x$cache" = xyes; then - echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GAUGE = yes; then @@ -12369,27 +10634,15 @@ if test "${enable_grid+set}" = set; then else wx_cv_use_grid='wxUSE_GRID=no' fi - cache=yes else - LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" fi eval "$wx_cv_use_grid" - if test "x$cache" = xyes; then - echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_GRID = yes; then @@ -12425,27 +10678,15 @@ if test "${enable_dataviewctrl+set}" = set; then else wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" fi eval "$wx_cv_use_dataviewctrl" - if test "x$cache" = xyes; then - echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DATAVIEWCTRL = yes; then @@ -12481,27 +10722,15 @@ if test "${enable_hyperlink+set}" = set; then else wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" fi eval "$wx_cv_use_hyperlink" - if test "x$cache" = xyes; then - echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_HYPERLINKCTRL = yes; then @@ -12537,27 +10766,15 @@ if test "${enable_imaglist+set}" = set; then else wx_cv_use_imaglist='wxUSE_IMAGLIST=no' fi - cache=yes else - LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" fi eval "$wx_cv_use_imaglist" - if test "x$cache" = xyes; then - echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_IMAGLIST = yes; then @@ -12593,27 +10810,15 @@ if test "${enable_listbook+set}" = set; then else wx_cv_use_listbook='wxUSE_LISTBOOK=no' fi - cache=yes else - LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" fi eval "$wx_cv_use_listbook" - if test "x$cache" = xyes; then - echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTBOOK = yes; then @@ -12649,27 +10854,15 @@ if test "${enable_listbox+set}" = set; then else wx_cv_use_listbox='wxUSE_LISTBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" fi eval "$wx_cv_use_listbox" - if test "x$cache" = xyes; then - echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTBOX = yes; then @@ -12705,27 +10898,15 @@ if test "${enable_listctrl+set}" = set; then else wx_cv_use_listctrl='wxUSE_LISTCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" fi eval "$wx_cv_use_listctrl" - if test "x$cache" = xyes; then - echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LISTCTRL = yes; then @@ -12761,27 +10942,15 @@ if test "${enable_notebook+set}" = set; then else wx_cv_use_notebook='wxUSE_NOTEBOOK=no' fi - cache=yes else - LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" fi eval "$wx_cv_use_notebook" - if test "x$cache" = xyes; then - echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NOTEBOOK = yes; then @@ -12797,6 +10966,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notifmsg" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-notifmsg... $ECHO_C" >&6; } + # Check whether --enable-notifmsg was given. +if test "${enable_notifmsg+set}" = set; then + enableval=$enable_notifmsg; + if test "$enableval" = yes; then + wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes' + else + wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no' + fi + +else + + wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}" + +fi + + + eval "$wx_cv_use_notifmsg" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_NOTIFICATION_MESSAGE = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_NOTIFICATION_MESSAGE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12817,27 +11030,15 @@ if test "${enable_odcombobox+set}" = set; then else wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" fi eval "$wx_cv_use_odcombobox" - if test "x$cache" = xyes; then - echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ODCOMBOBOX = yes; then @@ -12873,27 +11074,15 @@ if test "${enable_radiobox+set}" = set; then else wx_cv_use_radiobox='wxUSE_RADIOBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" fi eval "$wx_cv_use_radiobox" - if test "x$cache" = xyes; then - echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RADIOBOX = yes; then @@ -12929,27 +11118,15 @@ if test "${enable_radiobtn+set}" = set; then else wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' fi - cache=yes else - LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" fi eval "$wx_cv_use_radiobtn" - if test "x$cache" = xyes; then - echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_RADIOBTN = yes; then @@ -12985,27 +11162,15 @@ if test "${enable_sash+set}" = set; then else wx_cv_use_sash='wxUSE_SASH=no' fi - cache=yes else - LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" fi eval "$wx_cv_use_sash" - if test "x$cache" = xyes; then - echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SASH = yes; then @@ -13041,27 +11206,15 @@ if test "${enable_scrollbar+set}" = set; then else wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' fi - cache=yes else - LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" fi eval "$wx_cv_use_scrollbar" - if test "x$cache" = xyes; then - echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SCROLLBAR = yes; then @@ -13097,27 +11250,15 @@ if test "${enable_searchctrl+set}" = set; then else wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" fi eval "$wx_cv_use_searchctrl" - if test "x$cache" = xyes; then - echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SEARCHCTRL = yes; then @@ -13153,27 +11294,15 @@ if test "${enable_slider+set}" = set; then else wx_cv_use_slider='wxUSE_SLIDER=no' fi - cache=yes else - LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" fi eval "$wx_cv_use_slider" - if test "x$cache" = xyes; then - echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SLIDER = yes; then @@ -13209,27 +11338,15 @@ if test "${enable_spinbtn+set}" = set; then else wx_cv_use_spinbtn='wxUSE_SPINBTN=no' fi - cache=yes else - LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" fi eval "$wx_cv_use_spinbtn" - if test "x$cache" = xyes; then - echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPINBTN = yes; then @@ -13265,27 +11382,15 @@ if test "${enable_spinctrl+set}" = set; then else wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" fi eval "$wx_cv_use_spinctrl" - if test "x$cache" = xyes; then - echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPINCTRL = yes; then @@ -13321,27 +11426,15 @@ if test "${enable_splitter+set}" = set; then else wx_cv_use_splitter='wxUSE_SPLITTER=no' fi - cache=yes else - LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" fi eval "$wx_cv_use_splitter" - if test "x$cache" = xyes; then - echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLITTER = yes; then @@ -13377,27 +11470,15 @@ if test "${enable_statbmp+set}" = set; then else wx_cv_use_statbmp='wxUSE_STATBMP=no' fi - cache=yes else - LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" fi eval "$wx_cv_use_statbmp" - if test "x$cache" = xyes; then - echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATBMP = yes; then @@ -13433,27 +11514,15 @@ if test "${enable_statbox+set}" = set; then else wx_cv_use_statbox='wxUSE_STATBOX=no' fi - cache=yes else - LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" fi eval "$wx_cv_use_statbox" - if test "x$cache" = xyes; then - echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATBOX = yes; then @@ -13489,27 +11558,15 @@ if test "${enable_statline+set}" = set; then else wx_cv_use_statline='wxUSE_STATLINE=no' fi - cache=yes else - LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" fi eval "$wx_cv_use_statline" - if test "x$cache" = xyes; then - echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATLINE = yes; then @@ -13545,27 +11602,15 @@ if test "${enable_stattext+set}" = set; then else wx_cv_use_stattext='wxUSE_STATTEXT=no' fi - cache=yes else - LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" fi eval "$wx_cv_use_stattext" - if test "x$cache" = xyes; then - echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATTEXT = yes; then @@ -13601,27 +11646,15 @@ if test "${enable_statusbar+set}" = set; then else wx_cv_use_statusbar='wxUSE_STATUSBAR=no' fi - cache=yes else - LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" fi eval "$wx_cv_use_statusbar" - if test "x$cache" = xyes; then - echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STATUSBAR = yes; then @@ -13657,27 +11690,15 @@ if test "${enable_tabdialog+set}" = set; then else wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' fi - cache=yes else - LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" fi eval "$wx_cv_use_tabdialog" - if test "x$cache" = xyes; then - echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TAB_DIALOG = yes; then @@ -13713,27 +11734,15 @@ if test "${enable_taskbaricon+set}" = set; then else wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' fi - cache=yes else - LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" fi eval "$wx_cv_use_taskbaricon" - if test "x$cache" = xyes; then - echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TASKBARICON = yes; then @@ -13769,27 +11778,15 @@ if test "${enable_textctrl+set}" = set; then else wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" fi eval "$wx_cv_use_textctrl" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTCTRL = yes; then @@ -13825,27 +11822,15 @@ if test "${enable_togglebtn+set}" = set; then else wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi - cache=yes else - LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" fi eval "$wx_cv_use_togglebtn" - if test "x$cache" = xyes; then - echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOGGLEBTN = yes; then @@ -13881,27 +11866,15 @@ if test "${enable_toolbar+set}" = set; then else wx_cv_use_toolbar='wxUSE_TOOLBAR=no' fi - cache=yes else - LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" fi eval "$wx_cv_use_toolbar" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBAR = yes; then @@ -13937,27 +11910,15 @@ if test "${enable_tbarnative+set}" = set; then else wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi - cache=yes else - LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" fi eval "$wx_cv_use_tbarnative" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBAR_NATIVE = yes; then @@ -13993,27 +11954,15 @@ if test "${enable_treebook+set}" = set; then else wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi - cache=yes else - LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" fi eval "$wx_cv_use_treebook" - if test "x$cache" = xyes; then - echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TREEBOOK = yes; then @@ -14049,27 +11998,15 @@ if test "${enable_toolbook+set}" = set; then else wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' fi - cache=yes else - LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" fi eval "$wx_cv_use_toolbook" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLBOOK = yes; then @@ -14105,27 +12042,15 @@ if test "${enable_treectrl+set}" = set; then else wx_cv_use_treectrl='wxUSE_TREECTRL=no' fi - cache=yes else - LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" fi eval "$wx_cv_use_treectrl" - if test "x$cache" = xyes; then - echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TREECTRL = yes; then @@ -14161,27 +12086,15 @@ if test "${enable_tipwindow+set}" = set; then else wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi - cache=yes else - LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" fi eval "$wx_cv_use_tipwindow" - if test "x$cache" = xyes; then - echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TIPWINDOW = yes; then @@ -14217,27 +12130,15 @@ if test "${enable_popupwin+set}" = set; then 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" - cache=yes - else - cache=no - fi - wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" fi eval "$wx_cv_use_popupwin" - if test "x$cache" = xyes; then - echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_POPUPWIN = yes; then @@ -14275,27 +12176,15 @@ if test "${enable_commondlg+set}" = set; then else wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' fi - cache=yes else - LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" fi eval "$wx_cv_use_commondlg" - if test "x$cache" = xyes; then - echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COMMONDLGS = yes; then @@ -14331,27 +12220,15 @@ if test "${enable_aboutdlg+set}" = set; then else wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" fi eval "$wx_cv_use_aboutdlg" - if test "x$cache" = xyes; then - echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_ABOUTDLG = yes; then @@ -14387,27 +12264,15 @@ if test "${enable_choicedlg+set}" = set; then else wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" fi eval "$wx_cv_use_choicedlg" - if test "x$cache" = xyes; then - echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_CHOICEDLG = yes; then @@ -14443,27 +12308,15 @@ if test "${enable_coldlg+set}" = set; then else wx_cv_use_coldlg='wxUSE_COLOURDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" fi eval "$wx_cv_use_coldlg" - if test "x$cache" = xyes; then - echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_COLOURDLG = yes; then @@ -14499,27 +12352,15 @@ if test "${enable_filedlg+set}" = set; then else wx_cv_use_filedlg='wxUSE_FILEDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" fi eval "$wx_cv_use_filedlg" - if test "x$cache" = xyes; then - echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FILEDLG = yes; then @@ -14555,27 +12396,15 @@ if test "${enable_finddlg+set}" = set; then else wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" fi eval "$wx_cv_use_finddlg" - if test "x$cache" = xyes; then - echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FINDREPLDLG = yes; then @@ -14611,27 +12440,15 @@ if test "${enable_fontdlg+set}" = set; then else wx_cv_use_fontdlg='wxUSE_FONTDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" fi eval "$wx_cv_use_fontdlg" - if test "x$cache" = xyes; then - echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_FONTDLG = yes; then @@ -14667,27 +12484,15 @@ if test "${enable_dirdlg+set}" = set; then else wx_cv_use_dirdlg='wxUSE_DIRDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" fi eval "$wx_cv_use_dirdlg" - if test "x$cache" = xyes; then - echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_DIRDLG = yes; then @@ -14723,27 +12528,15 @@ if test "${enable_msgdlg+set}" = set; then else wx_cv_use_msgdlg='wxUSE_MSGDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" fi eval "$wx_cv_use_msgdlg" - if test "x$cache" = xyes; then - echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MSGDLG = yes; then @@ -14779,27 +12572,15 @@ if test "${enable_numberdlg+set}" = set; then else wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" fi eval "$wx_cv_use_numberdlg" - if test "x$cache" = xyes; then - echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_NUMBERDLG = yes; then @@ -14835,27 +12616,15 @@ if test "${enable_splash+set}" = set; then else wx_cv_use_splash='wxUSE_SPLASH=no' fi - cache=yes else - LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" fi eval "$wx_cv_use_splash" - if test "x$cache" = xyes; then - echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLASH = yes; then @@ -14891,27 +12660,15 @@ if test "${enable_textdlg+set}" = set; then else wx_cv_use_textdlg='wxUSE_TEXTDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" fi eval "$wx_cv_use_textdlg" - if test "x$cache" = xyes; then - echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TEXTDLG = yes; then @@ -14947,27 +12704,15 @@ if test "${enable_tipdlg+set}" = set; then else wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' fi - cache=yes else - LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" fi eval "$wx_cv_use_tipdlg" - if test "x$cache" = xyes; then - echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_STARTUP_TIPS = yes; then @@ -15003,27 +12748,15 @@ if test "${enable_progressdlg+set}" = set; then else wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" fi eval "$wx_cv_use_progressdlg" - if test "x$cache" = xyes; then - echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_PROGRESSDLG = yes; then @@ -15059,27 +12792,15 @@ if test "${enable_wizarddlg+set}" = set; then else wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' fi - cache=yes else - LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" fi eval "$wx_cv_use_wizarddlg" - if test "x$cache" = xyes; then - echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_WIZARDDLG = yes; then @@ -15117,27 +12838,15 @@ if test "${enable_menus+set}" = set; then else wx_cv_use_menus='wxUSE_MENUS=no' fi - cache=yes else - LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" fi eval "$wx_cv_use_menus" - if test "x$cache" = xyes; then - echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MENUS = yes; then @@ -15173,27 +12882,15 @@ if test "${enable_miniframe+set}" = set; then else wx_cv_use_miniframe='wxUSE_MINIFRAME=no' fi - cache=yes else - LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" fi eval "$wx_cv_use_miniframe" - if test "x$cache" = xyes; then - echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MINIFRAME = yes; then @@ -15229,27 +12926,15 @@ if test "${enable_tooltips+set}" = set; then else wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' fi - cache=yes else - LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" fi eval "$wx_cv_use_tooltips" - if test "x$cache" = xyes; then - echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_TOOLTIPS = yes; then @@ -15285,27 +12970,15 @@ if test "${enable_splines+set}" = set; then else wx_cv_use_splines='wxUSE_SPLINES=no' fi - cache=yes else - LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" fi eval "$wx_cv_use_splines" - if test "x$cache" = xyes; then - echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_SPLINES = yes; then @@ -15341,27 +13014,15 @@ if test "${enable_mousewheel+set}" = set; then else wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' fi - cache=yes else - LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" fi eval "$wx_cv_use_mousewheel" - if test "x$cache" = xyes; then - echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MOUSEWHEEL = yes; then @@ -15397,27 +13058,15 @@ if test "${enable_validators+set}" = set; then else wx_cv_use_validators='wxUSE_VALIDATORS=no' fi - cache=yes else - LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" fi eval "$wx_cv_use_validators" - if test "x$cache" = xyes; then - echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_VALIDATORS = yes; then @@ -15453,27 +13102,15 @@ if test "${enable_busyinfo+set}" = set; then else wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' fi - cache=yes else - LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" fi eval "$wx_cv_use_busyinfo" - if test "x$cache" = xyes; then - echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_BUSYINFO = yes; then @@ -15509,27 +13146,15 @@ if test "${enable_joystick+set}" = set; then 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 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 @@ -15565,27 +13190,15 @@ if test "${enable_metafile+set}" = set; then 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 @@ -15621,27 +13234,15 @@ if test "${enable_dragimage+set}" = set; then 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 @@ -15677,27 +13278,15 @@ if test "${enable_accessibility+set}" = set; then 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 @@ -15735,27 +13324,15 @@ if test "${enable_palette+set}" = set; then 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 @@ -15791,27 +13368,15 @@ if test "${enable_image+set}" = set; then 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 @@ -15847,27 +13412,15 @@ if test "${enable_gif+set}" = set; then 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 @@ -15903,27 +13456,15 @@ if test "${enable_pcx+set}" = set; then 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 @@ -15959,27 +13500,15 @@ if test "${enable_tga+set}" = set; then 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 @@ -16015,27 +13544,15 @@ if test "${enable_iff+set}" = set; then 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 @@ -16071,27 +13588,15 @@ if test "${enable_pnm+set}" = set; then 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 @@ -16127,27 +13632,15 @@ if test "${enable_xpm+set}" = set; then 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 @@ -16183,27 +13676,15 @@ if test "${enable_ico_cur+set}" = set; then 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 @@ -16241,27 +13722,15 @@ if test "${enable_dccache+set}" = set; then 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 @@ -16297,27 +13766,15 @@ if test "${enable_ps_in_msw+set}" = set; then else wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' fi - cache=yes else - 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 @@ -16353,27 +13810,15 @@ if test "${enable_ownerdrawn+set}" = set; then 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 @@ -16409,27 +13854,15 @@ if test "${enable_uxtheme+set}" = set; then 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 @@ -16465,27 +13898,15 @@ if test "${enable_wxdib+set}" = set; then 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 @@ -16501,124 +13922,55 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_MSW" != 1; then + DEFAULT_wxUSE_AUTOID_MANAGEMENT=no fi - echo "saving argument cache $wx_arg_cache_file" - mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-autoidman" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-autoidman... $ECHO_C" >&6; } + # Check whether --enable-autoidman was given. +if test "${enable_autoidman+set}" = set; then + enableval=$enable_autoidman; + if test "$enableval" = yes; then + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes' + else + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no' + fi +else -{ echo "$as_me:$LINENO: checking for toolkit" >&5 -echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; } + wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}" -# In Wine, we need to default to MSW, not GTK or MOTIF -if test "$wxUSE_WINE" = "yes"; then - DEFAULT_DEFAULT_wxUSE_GTK=0 - DEFAULT_DEFAULT_wxUSE_MOTIF=0 - DEFAULT_DEFAULT_wxUSE_MSW=1 - wxUSE_SHARED=no - CC=${CC:-winegcc} - CXX=${CXX:-wineg++} fi -if test "$wxUSE_GUI" = "yes"; then - - if test "$USE_BEOS" = 1; then - { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5 -echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} - { (exit 1); exit 1; }; } - fi - - if test "$TOOLKIT_GIVEN" = 1; then - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" = "xno"; then - eval "$var=0" - elif test "x$value" != "x"; then - eval "$var=1" - fi - - if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then - eval "wx${toolkit}_VERSION=$value" - fi - done - else - for toolkit in `echo $ALL_TOOLKITS`; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit - else - var=DEFAULT_wxUSE_$toolkit + eval "$wx_cv_use_autoidman" - eval "version=\$DEFAULT_wx${toolkit}_VERSION" - if test "x$version" != "x"; then - eval "wx${toolkit}_VERSION=$version" + if test x"$enablestring" = xdisable; then + if test $wxUSE_AUTOID_MANAGEMENT = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_AUTOID_MANAGEMENT fi - fi - eval "wxUSE_$toolkit=\$${var}" - done - fi - NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \ - + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \ - + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}` - - case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}` - esac - - case "$NUM_TOOLKITS" in - 1) - ;; - 0) - { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5 -echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;} - { (exit 1); exit 1; }; } - ;; - *) - { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5 -echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;} - { (exit 1); exit 1; }; } - esac + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } - # to be removed when --disable-gtk2 isn't needed - if test "x$wxUSE_GTK2" = "xyes"; then - wxGTK_VERSION=2 - elif test "x$wxUSE_GTK2" = "xno"; then - wxGTK_VERSION=1 - fi - for toolkit in `echo $ALL_TOOLKITS`; do - var=wxUSE_$toolkit - eval "value=\$${var}" - if test "x$value" != x; then - cache_var=CACHE_$toolkit - eval "cache=\$${cache_var}" - if test "$cache" = 1; then - echo "$var=$value" >> ${wx_arg_cache_file} - eval "version=\$wx${toolkit}_VERSION" - if test "x$version" != "x"; then - echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file} - fi - fi - if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"` - { echo "$as_me:$LINENO: result: $toolkit_echo" >&5 -echo "${ECHO_T}$toolkit_echo" >&6; } - fi - fi - done -else - if test "x$host_alias" != "x"; then - { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5 -echo "${ECHO_T}base ($host_alias hosted) only" >&6; } - else - { echo "$as_me:$LINENO: result: base only" >&5 -echo "${ECHO_T}base only" >&6; } - fi fi @@ -20458,6 +17810,8 @@ echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_ OSX_UNIV_OPTS="-arch ppc -arch i386" CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" CFLAGS="$OSX_UNIV_OPTS $CFLAGS" + OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS" + OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS" LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" retest_macosx_linking=yes @@ -20523,6 +17877,11 @@ echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.pl else wxUSE_MACOSX_VERSION_MIN= fi +elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then + if test "$wxUSE_MAC" = 1; then + # otherwise configure stops on leopard for universal_binary + wxUSE_MACOSX_VERSION_MIN=10.4 + fi fi if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then @@ -24721,7 +22080,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF - if test "$ac_cv_sizeof_long_long" != "0"; then + if test "$ac_cv_sizeof_long_long" != 0; then CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS" fi ;; @@ -25657,7 +23016,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF -if test "$ac_cv_sizeof_wchar_t" != "0"; then +if test "$ac_cv_sizeof_wchar_t" != 0; then wxUSE_WCHAR_T=yes else wxUSE_WCHAR_T=no @@ -27129,7 +24488,7 @@ echo "${ECHO_T}$wx_cv_class_stdbasicstring" >&6; } { { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5 echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;} { (exit 1); exit 1; }; } - elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then + elif test "$wxUSE_STD_STRING" = "yes"; then { { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5 echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;} { (exit 1); exit 1; }; } @@ -27274,7 +24633,7 @@ fi if test "$wxUSE_STD_IOSTREAM" != "yes"; then - if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then + if test "$wxUSE_STD_IOSTREAM" = "yes"; then { { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5 echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;} { (exit 1); exit 1; }; } @@ -27395,29 +24754,269 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_stdstring_compare=yes + wx_cv_func_stdstring_compare=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_func_stdstring_compare=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; } + + if test "$wx_cv_func_stdstring_compare" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_STRING_COMPARE 1 +_ACEOF + + fi + + if test "$wx_cv_class_gnuhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_EXT_HASH_MAP 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_GNU_CXX_HASH_MAP 1 +_ACEOF + + fi + + { echo "$as_me:$LINENO: checking for unordered_map" >&5 +echo $ECHO_N "checking for unordered_map... $ECHO_C" >&6; } +if test "${ac_cv_header_unordered_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_unordered_map=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_unordered_map=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_unordered_map" >&5 +echo "${ECHO_T}$ac_cv_header_unordered_map" >&6; } +if test $ac_cv_header_unordered_map = yes; then + { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std" >&5 +echo $ECHO_N "checking for unordered_map and unordered_set in std... $ECHO_C" >&6; } +if test "${wx_cv_class_stdunorderedmapset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include +int +main () +{ +std::unordered_map test1; + std::unordered_set test2; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_class_stdunorderedmapset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_class_stdunorderedmapset=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_stdunorderedmapset" >&5 +echo "${ECHO_T}$wx_cv_class_stdunorderedmapset" >&6; } +fi + + + + if test "$wx_cv_class_stdunorderedmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_UNORDERED_MAP 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define HAVE_STD_UNORDERED_SET 1 +_ACEOF + + else + { echo "$as_me:$LINENO: checking for tr1/unordered_map" >&5 +echo $ECHO_N "checking for tr1/unordered_map... $ECHO_C" >&6; } +if test "${ac_cv_header_tr1_unordered_map+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_tr1_unordered_map=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_tr1_unordered_map=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tr1_unordered_map" >&5 +echo "${ECHO_T}$ac_cv_header_tr1_unordered_map" >&6; } +if test $ac_cv_header_tr1_unordered_map = yes; then + { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std::tr1" >&5 +echo $ECHO_N "checking for unordered_map and unordered_set in std::tr1... $ECHO_C" >&6; } +if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include +int +main () +{ +std::tr1::unordered_map test1; + std::tr1::unordered_set test2; + #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2) + #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389 + #endif + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_class_tr1unorderedmapset=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_stdstring_compare=no - + wx_cv_class_tr1unorderedmapset=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_class_tr1unorderedmapset" >&5 +echo "${ECHO_T}$wx_cv_class_tr1unorderedmapset" >&6; } fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5 -echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; } - if test "$wx_cv_func_stdstring_compare" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_STD_STRING_COMPARE 1 + + + if test "$wx_cv_class_tr1unorderedmapset" = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_TR1_UNORDERED_MAP 1 _ACEOF - fi + cat >>confdefs.h <<\_ACEOF +#define HAVE_TR1_UNORDERED_SET 1 +_ACEOF - { echo "$as_me:$LINENO: checking for hash_map" >&5 + else + { echo "$as_me:$LINENO: checking for hash_map" >&5 echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; } if test "${ac_cv_header_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27463,8 +25062,8 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5 echo "${ECHO_T}$ac_cv_header_hash_map" >&6; } if test $ac_cv_header_hash_map = yes; then - { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5 -echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; } + { echo "$as_me:$LINENO: checking for std::hash_map and hash_set" >&5 +echo $ECHO_N "checking for std::hash_map and hash_set... $ECHO_C" >&6; } if test "${wx_cv_class_stdhashmapset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27475,12 +25074,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #include + #include int main () { std::hash_map, std::equal_to > test1; - std::hash_set, std::equal_to > test2; + std::hash_set, std::equal_to > test2; ; return 0; } @@ -27520,18 +25119,18 @@ fi - if test "$wx_cv_class_stdhashmapset" = yes; then - cat >>confdefs.h <<\_ACEOF + if test "$wx_cv_class_stdhashmapset" = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_HASH_MAP 1 _ACEOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_STD_HASH_MAP 1 _ACEOF - fi + fi - { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 + { echo "$as_me:$LINENO: checking for ext/hash_map" >&5 echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; } if test "${ac_cv_header_ext_hash_map+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -27589,12 +25188,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include - #include + #include int main () { __gnu_cxx::hash_map, std::equal_to > test1; - __gnu_cxx::hash_set, std::equal_to > test2; + __gnu_cxx::hash_set, std::equal_to > test2; ; return 0; } @@ -27634,23 +25233,15 @@ fi - if test "$wx_cv_class_gnuhashmapset" = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_EXT_HASH_MAP 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define HAVE_GNU_CXX_HASH_MAP 1 -_ACEOF - + fi 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; } + { echo "$as_me:$LINENO: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5 +echo $ECHO_N "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... $ECHO_C" >&6; } if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -27666,22 +25257,25 @@ int main () { - int value=0; - __sync_fetch_and_add(&value, 1); + unsigned int value=0; + /* wxAtomicInc doesn't use return value here */ + __sync_fetch_and_add(&value, 2); __sync_sub_and_fetch(&value, 1); + /* but wxAtomicDec does, so mimic that: */ + unsigned int r2 = __sync_sub_and_fetch(&value, 1); ; return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 @@ -27690,7 +25284,8 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then wx_cv_cc_gcc_atomic_builtins=yes else echo "$as_me: failed program was:" >&5 @@ -27699,7 +25294,8 @@ 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 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi @@ -27724,6 +25320,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu SEARCH_INCLUDE="\ /usr/local/include \ + /usr/local/X11/include \ + /usr/local/include/X11 \ + /usr/local/X11R6/include \ + /usr/local/include/X11R6 \ \ /usr/Motif-2.1/include \ /usr/Motif-1.2/include \ @@ -27736,29 +25336,25 @@ SEARCH_INCLUDE="\ \ /usr/X11R6/include \ /usr/X11R6.4/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ \ /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ \ /usr/X11/include \ /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ \ /usr/XFree86/include/X11 \ /usr/pkg/include \ \ + /usr/local/X1R5/include \ + /usr/local/include/X11R5 \ + /usr/X11R5/include \ + /usr/include/X11R5 \ + \ + /usr/local/X11R4/include \ + /usr/local/include/X11R4 \ + /usr/X11R4/include \ + /usr/include/X11R4 \ + \ /usr/openwin/share/include" { echo "$as_me:$LINENO: checking for libraries directory" >&5 @@ -28637,8 +26233,8 @@ _ACEOF if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then - { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5 -echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;} + { echo "$as_me:$LINENO: WARNING: Defaulting to the builtin regex library for Unicode build." >&5 +echo "$as_me: WARNING: Defaulting to the builtin regex library for Unicode build." >&2;} wxUSE_REGEX=builtin fi @@ -30058,10 +27654,13 @@ 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 + if test "$wxUSE_LIBTIFF" = "builtin" ; then + if test "$wxUSE_LIBJPEG" = "no"; then + ac_configure_args="$ac_configure_args --disable-jpeg" fi + subdirs="$subdirs src/tiff" + fi fi @@ -30549,8 +28148,14 @@ fi + case "${host}" in + x86_64-*-mingw32* ) + LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32" + ;; + * ) LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" - + ;; + esac if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" fi @@ -30560,17 +28165,6 @@ fi LIBS="$LIBS -lkernel32 -luser32" esac - if test "$wxUSE_ODBC" = "sys" ; then - wxUSE_ODBC = "yes" - fi - if test "$wxUSE_ODBC" = "yes" ; then - LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS" - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ODBC 1 -_ACEOF - - fi - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" RESPROGRAMOBJ="\$(PROGRAM)_resources.o" @@ -30641,7 +28235,7 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK12= WXGTK127= - WXGTK20= + WXGTK2= WXGPE= if test "$wxUSE_COCOA" = 1 ; then @@ -30774,7 +28368,7 @@ fi no_gtk=yes fi - min_gtk_version=2.0.0 + min_gtk_version=2.4.0 { echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5 echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; } @@ -31692,7 +29286,7 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; } fi case "$wx_cv_lib_gtk" in - 2.0) WXGTK20=1 + 2.0) WXGTK2=1 TOOLKIT_VERSION=2 ;; 1.2.7) WXGTK127=1 @@ -31720,86 +29314,12 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config ;; esac - if test "$WXGTK20" = 1; then + if test "$WXGTK2" = 1; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" CFLAGS="$wx_cv_cflags_gtk $CFLAGS" LIBS="$LIBS $wx_cv_libs_gtk" - { echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5 -echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6; } -if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -int -main () -{ -#ifndef gtk_icon_size_lookup - (void) gtk_icon_size_lookup; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_have_decl_gtk_icon_size_lookup=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_have_decl_gtk_icon_size_lookup=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5 -echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6; } -if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0 -_ACEOF - -cat >>confdefs.h <<\_ACEOF -#define NEED_GTK_ICON_SIZE_LOOKUP 1 -_ACEOF - -fi - - - - { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5 echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -31847,10 +29367,6 @@ _ACEOF cat >>confdefs.h <<\_ACEOF #define __WXGTK26__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define __WXGTK24__ 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 @@ -31914,10 +29430,6 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat >>confdefs.h <<\_ACEOF #define __WXGTK26__ 1 -_ACEOF - - cat >>confdefs.h <<\_ACEOF -#define __WXGTK24__ 1 _ACEOF { echo "$as_me:$LINENO: result: yes" >&5 @@ -31935,68 +29447,6 @@ echo "${ECHO_T}no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - - if test "$ac_wxgtk26" = 0; then - { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5 -echo $ECHO_N "checking if GTK+ is version >= 2.4... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - -int -main () -{ - - #if !GTK_CHECK_VERSION(2,4,0) - Not GTK+ 2.4 - #endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - - cat >>confdefs.h <<\_ACEOF -#define __WXGTK24__ 1 -_ACEOF - - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - -fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -34583,9 +32033,9 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6; } libsm_ice_link="" libs_found=0 for libp in "" " -lXp"; do - if test "$libs_found" = "0"; then + if test "$libs_found" = 0; then for libsm_ice in "" " -lSM -lICE"; do - if test "$libs_found" = "0"; then + if test "$libs_found" = 0; then save_LIBS="$LIBS" LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" save_CFLAGS=$CFLAGS @@ -34657,7 +32107,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi done - if test "$libs_found" = "0"; then + if test "$libs_found" = 0; then { echo "$as_me:$LINENO: result: can't find the right libraries" >&5 echo "${ECHO_T}can't find the right libraries" >&6; } { { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5 @@ -35126,7 +32576,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi fi - if test "$wxUSE_MAC" = 1; then + if test "$wxUSE_OSX_CARBON" = 1; then { echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5 echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; } if test "$GCC" = yes; then @@ -35148,11 +32598,16 @@ echo "${ECHO_T}none" >&6; } CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS" fi - TOOLKIT=MAC - GUIDIST=MACX_DIST + TOOLKIT=OSX_CARBON + GUIDIST=OSX_CARBON_DIST WXBASEPORT="_carbon" fi + if test "$wxUSE_OSX_COCOA" = 1; then + TOOLKIT=OSX_COCOA + GUIDIST=OSX_COCOA_DIST + fi + if test "$wxUSE_COCOA" = 1; then TOOLKIT=COCOA GUIDIST=COCOA_DIST @@ -35231,7 +32686,7 @@ _ACEOF if test "$TOOLKIT" = "PM" ; then TOOLKIT_DIR="os2" else - TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"` + TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'` fi if test "$wxUSE_UNIVERSAL" = "yes"; then @@ -35257,9 +32712,9 @@ fi if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then - if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then + if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then wxUSE_UNICODE_UTF8=yes - elif test "$USE_OS2" = "1" ; then + elif test "$USE_OS2" = 1 ; then wxUSE_UNICODE_UTF8=yes else wxUSE_UNICODE_UTF8=no @@ -35328,82 +32783,12 @@ fi done -for ac_header in X11/XKBlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #if HAVE_X11_XLIB_H - #include - #endif - - -#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 - - fi -fi - - - -IODBC_C_SRC="" - - -if test "$TOOLKIT" != "MSW" ; then - - if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then - - { echo "$as_me:$LINENO: checking for sql.h" >&5 -echo $ECHO_N "checking for sql.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sql_h+set}" = set; then +for ac_header in X11/XKBlib.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35413,8 +32798,12 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #if HAVE_X11_XLIB_H + #include + #endif + -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -35433,258 +32822,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_sql_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_sql_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sql_h" >&5 -echo "${ECHO_T}$ac_cv_header_sql_h" >&6; } -if test $ac_cv_header_sql_h = yes; then - found_sql_h=1 -fi - - - if test "x$found_sql_h" = "x1" ; then - { echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5 -echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6; } -if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_iodbc_SQLAllocEnv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_iodbc_SQLAllocEnv=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5 -echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6; } -if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then - ODBC_LINK=" -liodbc" -else - - { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5 -echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6; } -if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lunixodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_unixodbc_SQLAllocEnv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_unixodbc_SQLAllocEnv=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5 -echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6; } -if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then - ODBC_LINK=" -lunixodbc" -else - - { echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5 -echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6; } -if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lodbc $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SQLAllocEnv (); -int -main () -{ -return SQLAllocEnv (); - ; - return 0; -} +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 -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_odbc_SQLAllocEnv=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_odbc_SQLAllocEnv=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5 -echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6; } -if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then - ODBC_LINK=" -lodbc" -fi - fi - -fi - - fi - if test "x$ODBC_LINK" = "x" ; then - if test "$wxUSE_ODBC" = "sys" ; then - { { echo "$as_me:$LINENO: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&5 -echo "$as_me: error: system ODBC library not found! Use --with-odbc=builtin to use built-in version" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: system ODBC library not found, will use built-in instead" >&5 -echo "$as_me: WARNING: system ODBC library not found, will use built-in instead" >&2;} - wxUSE_ODBC=builtin - fi - else - wxUSE_ODBC=sys - fi - fi - - if test "$wxUSE_ODBC" = "builtin" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_BUILTIN_IODBC 1 -_ACEOF +done fi fi -if test "$wxUSE_ODBC" != "no" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ODBC 1 -_ACEOF - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" - - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_IODBC_" -fi if test "$wxUSE_DISPLAY" = "yes"; then @@ -35919,11 +33081,11 @@ fi USE_OPENGL=0 if test "$wxUSE_OPENGL" = "yes"; then - if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then + if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = 1; then { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5 echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;} wxUSE_OPENGL="no" - elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then + elif test "$wxUSE_OSX_CARBON" = 1 -o test "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" @@ -36779,7 +33941,7 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then DEBUG_INFO=1 fi -WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"` +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'` TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}" @@ -37028,157 +34190,31 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_type_off_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_off_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -echo "${ECHO_T}$ac_cv_type_off_t" >&6; } -if test $ac_cv_type_off_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for pid_t" >&5 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } -if test "${ac_cv_type_pid_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef pid_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_pid_t=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_pid_t=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } -if test $ac_cv_type_pid_t = yes; then - : -else - -cat >>confdefs.h <<_ACEOF -#define pid_t int -_ACEOF - -fi - -{ echo "$as_me:$LINENO: checking for size_t" >&5 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } -if test "${ac_cv_type_size_t+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -typedef size_t ac__type_new_; -int -main () -{ -if ((ac__type_new_ *) 0) - return 0; -if (sizeof (ac__type_new_)) - return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_type_size_t=yes + ac_cv_type_off_t=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_type_size_t=no + ac_cv_type_off_t=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -echo "${ECHO_T}$ac_cv_type_size_t" >&6; } -if test $ac_cv_type_size_t = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 +echo "${ECHO_T}$ac_cv_type_off_t" >&6; } +if test $ac_cv_type_off_t = yes; then : else cat >>confdefs.h <<_ACEOF -#define size_t unsigned int +#define off_t long int _ACEOF fi -{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 -echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } +if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -37187,29 +34223,117 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - +$ac_includes_default +typedef pid_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then - ac_cv_type_uid_t=yes +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_pid_t=yes else - ac_cv_type_uid_t=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_pid_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 -echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } -if test $ac_cv_type_uid_t = no; then +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } +if test $ac_cv_type_pid_t = yes; then + : +else -cat >>confdefs.h <<\_ACEOF -#define uid_t int +cat >>confdefs.h <<_ACEOF +#define pid_t int _ACEOF +fi -cat >>confdefs.h <<\_ACEOF -#define gid_t int +{ echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef size_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_size_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_size_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } +if test $ac_cv_type_size_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int _ACEOF fi @@ -38076,7 +35200,8 @@ fi -for ac_func in snprintf vsnprintf + +for ac_func in snprintf vsnprintf vsscanf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -38170,6 +35295,12 @@ fi done +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test "$ac_cv_func_vsnprintf" = "yes"; then { echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5 echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; } @@ -38219,7 +35350,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then wx_cv_func_vsnprintf_decl=yes @@ -38293,7 +35424,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then wx_cv_func_broken_vsnprintf_decl=no @@ -38349,7 +35480,167 @@ main () { char *buf; - snprintf(buf, 10u, "%s", "wx"); + snprintf(buf, 10u, "%s", "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_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_func_snprintf_decl=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_func_snprintf_decl=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5 +echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; } + + if test "$wx_cv_func_snprintf_decl" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_SNPRINTF_DECL 1 +_ACEOF + + fi + + if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then + + { echo "$as_me:$LINENO: checking if snprintf supports positional arguments" >&5 +echo $ECHO_N "checking if snprintf supports positional arguments... $ECHO_C" >&6; } +if test "${wx_cv_func_snprintf_pos_params+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + + { echo "$as_me:$LINENO: WARNING: Assuming Unix98 printf() is not available, +define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5 +echo "$as_me: WARNING: Assuming Unix98 printf() is not available, +define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;} + wx_cv_func_snprintf_pos_params=no + + +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 (void) + { + char buffer[128]; + snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3); + if (strcmp ("2 3 1", buffer) == 0) + exit (0); + exit (1); + } + +_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_snprintf_pos_params=no +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_snprintf_pos_params=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_pos_params" >&5 +echo "${ECHO_T}$wx_cv_func_snprintf_pos_params" >&6; } + + if test "$wx_cv_func_snprintf_pos_params" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_UNIX98_PRINTF 1 +_ACEOF + + fi + fi +fi + +if test "$ac_cv_func_vsscanf" = "yes"; then + { echo "$as_me:$LINENO: checking for vsscanf declaration" >&5 +echo $ECHO_N "checking for vsscanf declaration... $ECHO_C" >&6; } +if test "${wx_cv_func_vsscanf_decl+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + #ifdef __MSL__ + #if __MSL__ >= 0x6000 + namespace std {} + using namespace std; + #endif + #endif + +int +main () +{ + + char *buf; + va_list args; + vsscanf(buf, "%s", args); ; return 0; @@ -38369,15 +35660,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || + test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_snprintf_decl=yes + wx_cv_func_vsscanf_decl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_snprintf_decl=no + wx_cv_func_vsscanf_decl=no fi @@ -38385,101 +35676,23 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5 -echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_func_vsscanf_decl" >&5 +echo "${ECHO_T}$wx_cv_func_vsscanf_decl" >&6; } - if test "$wx_cv_func_snprintf_decl" = "yes"; then + if test "$wx_cv_func_vsscanf_decl" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_SNPRINTF_DECL 1 +#define HAVE_VSSCANF_DECL 1 _ACEOF fi - - if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then - - { echo "$as_me:$LINENO: checking if snprintf supports positional arguments" >&5 -echo $ECHO_N "checking if snprintf supports positional arguments... $ECHO_C" >&6; } -if test "${wx_cv_func_snprintf_pos_params+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - - { echo "$as_me:$LINENO: WARNING: Assuming Unix98 printf() is not available, -define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5 -echo "$as_me: WARNING: Assuming Unix98 printf() is not available, -define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;} - wx_cv_func_snprintf_pos_params=no - - -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 (void) - { - char buffer[128]; - snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3); - if (strcmp ("2 3 1", buffer) == 0) - exit (0); - exit (1); - } - -_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_snprintf_pos_params=no -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_snprintf_pos_params=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_pos_params" >&5 -echo "${ECHO_T}$wx_cv_func_snprintf_pos_params" >&6; } - - if test "$wx_cv_func_snprintf_pos_params" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_UNIX98_PRINTF 1 -_ACEOF - - fi - fi -fi - if test "$wxUSE_UNICODE" = yes; then wchar_headers="#include @@ -38551,7 +35764,7 @@ done esac - for wx_func in putws fputws wprintf vswprintf + for wx_func in putws fputws wprintf vswprintf vswscanf do { echo "$as_me:$LINENO: checking for $wx_func" >&5 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } @@ -38863,7 +36076,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "$TOOLKIT" != "MSW"; then - +if test "$wxUSE_LIBICONV" != "no" ; then @@ -39075,7 +36288,8 @@ _ACEOF fi -LIBS="$LIBICONV $LIBS" + LIBS="$LIBICONV $LIBS" +fi if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then @@ -39419,7 +36633,7 @@ _ACEOF fi fi -if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then +if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then { echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5 echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;} wxUSE_STACKWALKER=no @@ -41354,6 +38568,7 @@ _ACEOF done + for wx_func in getpwuid_r do { echo "$as_me:$LINENO: checking for $wx_func" >&5 @@ -41370,8 +38585,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #define _REENTRANT - #include + + #define _REENTRANT + #include + $ac_includes_default int @@ -41382,6 +38599,10 @@ main () &$wx_func; #endif + struct passwd pw, *ppw; + char buf[1024]; + getpwuid_r(0, &pw, buf, sizeof(buf), &ppw) + ; return 0; @@ -41436,6 +38657,7 @@ _ACEOF done + for wx_func in getgrgid_r do { echo "$as_me:$LINENO: checking for $wx_func" >&5 @@ -41452,8 +38674,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #define _REENTRANT - #include + + #define _REENTRANT + #include + $ac_includes_default int @@ -41464,6 +38688,10 @@ main () &$wx_func; #endif + struct group grp, *pgrp; + char buf[1024]; + getgrgid_r(0, &grp, buf, sizeof(buf), &pgrp) + ; return 0; @@ -42985,12 +40213,77 @@ _ACEOF { echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5 echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;} fi + fi + + { echo "$as_me:$LINENO: checking for __thread keyword" >&5 +echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; } +if test "${wx_cv_cc___thread+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + static __thread int n = 0; + static __thread int *p = 0; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_cc___thread=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc___thread=no + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5 +echo "${ECHO_T}$wx_cv_cc___thread" >&6; } + + if test "$wx_cv_cc___thread" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE___THREAD_KEYWORD 1 +_ACEOF + fi fi else if test "$wxUSE_THREADS" = "yes" ; then case "${host}" in + x86_64-*-mingw32* ) + ;; *-*-mingw32* ) { echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5 echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; } @@ -43950,9 +41243,9 @@ echo "${ECHO_T}no" >&6; } fi fi -if test "$WXGTK20" = 1 ; then +if test "$WXGTK2" = 1 ; then cat >>confdefs.h <<_ACEOF -#define __WXGTK20__ $WXGTK20 +#define __WXGTK20__ $WXGTK2 _ACEOF WXGTK12=1 @@ -43982,7 +41275,6 @@ fi DEBUG_CFLAGS= if test "$wxUSE_DEBUG_INFO" = "yes" ; then DEBUG_CFLAGS="-g" - wxUSE_OPTIMISE=no fi if test "$wxUSE_DEBUG_GDB" = "yes" ; then @@ -44112,9 +41404,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then - if test "$USE_DARWIN" = 1; then - HAVE_DL_FUNCS=1 - elif test "$USE_DOS" = 1; then + if test "$USE_DOS" = 1; then HAVE_DL_FUNCS=0 else @@ -44467,7 +41757,7 @@ fi done - if test "$HAVE_DL_FUNCS" = 1; then + if test "$HAVE_DL_FUNCS" = 1; then for ac_func in dlerror do @@ -44564,7 +41854,7 @@ _ACEOF else - { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5 + { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5 echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; } if test "${ac_cv_lib_dl_dlerror+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -44637,7 +41927,11 @@ fi fi done + fi fi + + if test "$USE_DARWIN" = 1; then + HAVE_DL_FUNCS=1 fi if test "$HAVE_DL_FUNCS" = 0; then @@ -44724,7 +42018,7 @@ _ACEOF fi -if test "$USE_UNIX" = "1" ; then +if test "$USE_UNIX" = 1 ; then if test "$wxUSE_MGL" != 1; then { echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; } @@ -44852,7 +42146,7 @@ fi WITH_PLUGIN_SDL=0 if test "$wxUSE_SOUND" = "yes"; then - if test "$USE_UNIX" = "1" ; then + if test "$USE_UNIX" = 1 ; then if test "$wxUSE_LIBSDL" != "no"; then # Check whether --with-sdl-prefix was given. @@ -45189,7 +42483,7 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" fi -if test "$WXGTK20" = 1; then +if test "$WXGTK2" = 1; then if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -45810,7 +43104,7 @@ _ACEOF fi if test "$wxUSE_DEBUGREPORT" = "yes"; then - if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then + if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then { echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5 echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;} wxUSE_DEBUGREPORT=no @@ -45910,6 +43204,77 @@ _ACEOF fi fi +if test "$wxUSE_XLOCALE" == "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_XLOCALE 1 +_ACEOF + + { echo "$as_me:$LINENO: checking for locale_t" >&5 +echo $ECHO_N "checking for locale_t... $ECHO_C" >&6; } +if test "${ac_cv_type_locale_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + #include + +typedef locale_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_locale_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_locale_t=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_locale_t" >&5 +echo "${ECHO_T}$ac_cv_type_locale_t" >&6; } +if test $ac_cv_type_locale_t = yes; then + +cat >>confdefs.h <<_ACEOF +#define HAVE_LOCALE_T 1 +_ACEOF + + +fi + +fi + if test "$wxUSE_LOG" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_LOG 1 @@ -46873,7 +44238,7 @@ fi if test "$wxUSE_SOCKETS" = "yes"; then - if test "$wxUSE_MGL" = "1"; then + if test "$wxUSE_MGL" = 1; then { echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5 echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;} wxUSE_SOCKETS="no" @@ -47284,28 +44649,71 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=socklen_t + wx_cv_type_getsockopt5=socklen_t +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + size_t len; + getsockopt(0, 0, 0, 0, &len); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_type_getsockopt5=size_t else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - size_t len; - getsockopt(0, 0, 0, 0, &len); + int len; + getsockopt(0, 0, 0, 0, &len); ; return 0; @@ -47328,27 +44736,73 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=size_t + wx_cv_type_getsockopt5=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + wx_cv_type_getsockopt5=unknown + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5 +echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; } + + if test "$wx_cv_type_getsockopt5" = "unknown"; then + wxUSE_SOCKETS=no + { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 +echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} + else + cat >>confdefs.h <<_ACEOF +#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 +_ACEOF + + fi + fi +fi + +if test "$wxUSE_SOCKETS" = "yes" ; then + if test "$wxUSE_IPV6" = "yes"; then + { echo "$as_me:$LINENO: checking whether we have sockaddr_in6" >&5 +echo $ECHO_N "checking whether we have sockaddr_in6... $ECHO_C" >&6; } +if test "${wx_cv_type_sockaddr_in6+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include + #include int main () { - int len; - getsockopt(0, 0, 0, 0, &len); + struct sockaddr_in6 sa6; ; return 0; @@ -47368,19 +44822,15 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=int + wx_cv_type_sockaddr_in6=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_type_getsockopt5=unknown - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + wx_cv_type_sockaddr_in6=no fi @@ -47388,33 +44838,20 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $wx_cv_type_sockaddr_in6" >&5 +echo "${ECHO_T}$wx_cv_type_sockaddr_in6" >&6; } -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5 -echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; } - - if test "$wx_cv_type_getsockopt5" = "unknown"; then - wxUSE_SOCKETS=no - { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 -echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else - cat >>confdefs.h <<_ACEOF -#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 + if test "$wx_cv_type_sockaddr_in6"="yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_IPV6 1 _ACEOF + else + { echo "$as_me:$LINENO: WARNING: IPv6 support not available... disabled" >&5 +echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;} fi fi -fi -if test "$wxUSE_SOCKETS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SOCKETS 1 _ACEOF @@ -47497,7 +44934,7 @@ if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then if test "$TOOLKIT" = "MSW"; then wxUSE_JOYSTICK=yes - elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then + elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then if test "$USE_DARWIN" = 1; then { echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5 echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; } @@ -47562,7 +44999,7 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; } fi else - if test "$wxUSE_MGL" != "1"; then + if test "$wxUSE_MGL" != 1; then for ac_header in linux/joystick.h do @@ -47782,9 +45219,6 @@ if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview" - if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi" - fi fi if test "$wxUSE_HELP" = "yes"; then @@ -48378,6 +45812,13 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook" fi +if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_NOTIFICATION_MESSAGE 1 +_ACEOF + +fi + if test "$wxUSE_ODCOMBOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_ODCOMBOBOX 1 @@ -48520,6 +45961,15 @@ _ACEOF USES_CONTROLS=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text" + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHEDIT 1 +_ACEOF + + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHEDIT2 1 +_ACEOF + fi if test "$wxUSE_TOGGLEBTN" = "yes"; then @@ -48606,7 +46056,7 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit fi if test "$wxUSE_POPUPWIN" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_COCOA" = 1 ; then { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5 echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;} else @@ -48695,9 +46145,6 @@ _ACEOF USE_HTML=1 SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" - if test "$wxUSE_MAC" = 1; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl" - fi fi if test "$wxUSE_WEBKIT" = "yes"; then if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then @@ -48776,6 +46223,9 @@ _ACEOF else wxUSE_WEBKIT=no fi + if test "$wxUSE_WEBKIT" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl" + fi fi USE_XRC=0 @@ -48804,6 +46254,16 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui" fi +USE_PROPGRID=0 +if test "$wxUSE_PROPGRID" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_PROPGRID 1 +_ACEOF + + USE_PROPGRID=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid" +fi + USE_STC=0 if test "$wxUSE_STC" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -49068,6 +46528,16 @@ _ACEOF fi +if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then + if test "$wxUSE_OWNER_DRAWN" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNER_DRAWN 1 +_ACEOF + + fi +fi + + if test "$wxUSE_MSW" = 1 ; then if test "$wxUSE_DC_CACHEING" = "yes"; then @@ -49084,13 +46554,6 @@ _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 @@ -49107,6 +46570,12 @@ _ACEOF fi +if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_AUTOID_MANAGEMENT 1 +_ACEOF + +fi if test "$USE_WIN32" = 1 ; then if test "$wxUSE_INICONF" = "yes"; then @@ -49125,8 +46594,12 @@ _ACEOF fi +if test "$wxUSE_MAC" = 1; then + wxUSE_GRAPHICS_CONTEXT="yes" +fi + if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then + if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then cat >>confdefs.h <<\_ACEOF #define wxUSE_GRAPHICS_CONTEXT 1 _ACEOF @@ -49398,7 +46871,7 @@ fi if test "$wxUSE_GSTREAMER" = "yes"; then CPPFLAGS="$GST_CFLAGS $CPPFLAGS" - LIBS="$GST_LIBS $LIBS" + EXTRALIBS_MEDIA="$GST_LIBS" cat >>confdefs.h <<\_ACEOF #define wxUSE_GSTREAMER 1 @@ -49448,15 +46921,12 @@ _ACEOF STD_BASE_LIBS="base" STD_GUI_LIBS="" BUILT_WX_LIBS="base" -ALL_WX_LIBS="xrc stc gl media dbgrid qa html adv core odbc xml net base" +ALL_WX_LIBS="xrc stc gl media qa html adv core xml net base" if test "$wxUSE_SOCKETS" = "yes" ; then STD_BASE_LIBS="net $STD_BASE_LIBS" BUILT_WX_LIBS="net $BUILT_WX_LIBS" fi -if test "$wxUSE_ODBC" != "no" ; then - BUILT_WX_LIBS="odbc $BUILT_WX_LIBS" -fi if test "$wxUSE_XML" = "yes" ; then STD_BASE_LIBS="xml $STD_BASE_LIBS" BUILT_WX_LIBS="xml $BUILT_WX_LIBS" @@ -49470,9 +46940,6 @@ if test "$wxUSE_GUI" = "yes"; then STD_GUI_LIBS="qa $STD_GUI_LIBS" BUILT_WX_LIBS="qa $BUILT_WX_LIBS" fi - if test "$wxUSE_ODBC" != "no" ; then - BUILT_WX_LIBS="dbgrid $BUILT_WX_LIBS" - fi if test "$wxUSE_HTML" = "yes" ; then STD_GUI_LIBS="html $STD_GUI_LIBS" BUILT_WX_LIBS="html $BUILT_WX_LIBS" @@ -49486,6 +46953,9 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_AUI" = "yes" ; then BUILT_WX_LIBS="aui $BUILT_WX_LIBS" fi + if test "$wxUSE_PROPGRID" = "yes" ; then + BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS" + fi if test "$wxUSE_STC" = "yes" ; then BUILT_WX_LIBS="stc $BUILT_WX_LIBS" fi @@ -49506,14 +46976,10 @@ if test "$wxUSE_MAC" = 1 ; then if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then if test "$USE_DARWIN" = 1; then LDFLAGS="$LDFLAGS -framework QuickTime" - else - LDFLAGS="$LDFLAGS -lQuickTimeLib" fi fi if test "$USE_DARWIN" = 1; then - LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System" - else - LDFLAGS="$LDFLAGS -lCarbonLib" + LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL" fi fi if test "$wxUSE_COCOA" = 1 ; then @@ -49550,6 +47016,12 @@ if test "$wxUSE_GUI" = "yes"; then fi else SAMPLES_SUBDIRS="console" + if test "$wxUSE_SOCKETS" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets" + fi + if test "$wxUSE_IPC" = "yes" ; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc" + fi fi @@ -49562,7 +47034,7 @@ fi if test "x$INTELCXX" = "xyes" ; then CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419" elif test "$GXX" = yes ; then - CXXWARNINGS="-Wall -Wundef -Wno-ctor-dtor-privacy" + CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" fi @@ -49578,6 +47050,8 @@ CPPFLAGS=`echo $WXCONFIG_CPPFLAGS \ C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS" CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS ` CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS ` +OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS ` +OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS ` WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS` @@ -49593,7 +47067,7 @@ LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" -EXTRALIBS_ODBC="$ODBC_LINK" +EXTRALIBS_MEDIA="$GST_LIBS" EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` @@ -49612,9 +47086,6 @@ fi if test "$wxUSE_EXPAT" = "builtin" ; then wxconfig_3rdparty="expat $wxconfig_3rdparty" fi -if test "$wxUSE_ODBC" = "builtin" ; then - wxconfig_3rdparty="odbc $wxconfig_3rdparty" -fi if test "$wxUSE_LIBTIFF" = "builtin" ; then wxconfig_3rdparty="tiff $wxconfig_3rdparty" fi @@ -49645,7 +47116,7 @@ _ACEOF ;; *) - for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do + for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do cat >>confdefs.h <<_ACEOF #define wxUSE_THEME_$t 1 _ACEOF @@ -49663,7 +47134,6 @@ fi - if test $wxUSE_MONOLITHIC = "yes" ; then MONOLITHIC=1 else @@ -49676,12 +47146,6 @@ else USE_PLUGINS=0 fi -if test $wxUSE_ODBC != "no" ; then - USE_ODBC=1 -else - USE_ODBC=0 -fi - if test "$wxUSE_DEBUGREPORT" = "yes" ; then USE_QA=1 else @@ -49720,7 +47184,12 @@ fi -TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"` + +if test "$TOOLKIT" = "MAC"; then + TOOLKIT_LOWERCASE=osx +else + TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` +fi @@ -49732,7 +47201,7 @@ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"` case "$TOOLKIT" in GTK) TOOLKIT_DESC="GTK+" - if test "$WXGTK20" = 1; then + if test "$WXGTK2" = 1; then TOOLKIT_DESC="$TOOLKIT_DESC 2" if test "$wxUSE_GTKPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; @@ -49816,6 +47285,9 @@ fi + + + if test "x$BAKEFILE_HOST" = "x"; then if test "x${host}" = "x" ; then { { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5 @@ -50350,14 +47822,20 @@ else fi - case ${BAKEFILE_HOST} in - *-hp-hpux* ) - INSTALL_DIR="mkdir -p" - ;; - * ) - INSTALL_DIR='$(INSTALL) -d' - ;; - esac + { echo "$as_me:$LINENO: checking for command to install directories" >&5 +echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; } + INSTALL_TEST_DIR=acbftest$$ + $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1 + if test $? = 0 -a -d $INSTALL_TEST_DIR; then + rmdir $INSTALL_TEST_DIR + INSTALL_DIR='$(INSTALL) -d' + { echo "$as_me:$LINENO: result: $INSTALL -d" >&5 +echo "${ECHO_T}$INSTALL -d" >&6; } + else + INSTALL_DIR="mkdir -p" + { echo "$as_me:$LINENO: result: mkdir -p" >&5 +echo "${ECHO_T}mkdir -p" >&6; } + fi LDFLAGS_GUI= @@ -50451,7 +47929,7 @@ echo "${ECHO_T}$bakefile_cv_prog_makeisgnu" >&6; } PLATFORM_BEOS=1 ;; * ) - ;; + ;; esac fi @@ -50630,6 +48108,10 @@ objects="" linking_flag="-dynamiclib" ldargs="-r -keep_private_externs -nostdlib" +if test "x${D}CXX" = "x"; then + CXX="c++" +fi + while test ${D}# -gt 0; do case ${D}1 in @@ -50643,6 +48125,12 @@ while test ${D}# -gt 0; do shift ;; + -arch|-isysroot) + # collect these options and values + ldargs="${D}{ldargs} ${D}1 ${D}2" + shift + ;; + -s|-Wl,*) # collect these load args ldargs="${D}{ldargs} ${D}1" @@ -50682,9 +48170,9 @@ status=0 # Link one module containing all the others # if test ${D}{verbose} = 1; then - echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" + echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o" fi -c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o +${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o status=${D}? # @@ -50693,9 +48181,9 @@ status=${D}? # if test ${D}{status} = 0; then if test ${D}{verbose} = 1; then - echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}" + echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}" fi - c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args} + ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args} status=${D}? fi @@ -50710,7 +48198,7 @@ EOF chmod +x shared-ld-sh SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o" - SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC" + SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC" { echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5 @@ -51393,7 +48881,8 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} SONAME_FLAG= case "${BAKEFILE_HOST}" in - *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu ) + *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ + *-*-k*bsd*-gnu | *-*-mirbsd* ) if test "x$SUNCXX" = "xyes"; then SONAME_FLAG="-h " else @@ -51498,7 +48987,7 @@ D='$' cat <bk-deps #!/bin/sh -# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to track C/C++ files dependencies in portable way. # # Permission is given to use this file in any way. @@ -51512,10 +49001,8 @@ mkdir -p ${D}DEPSDIR if test ${D}DEPSMODE = gcc ; then ${D}* ${D}{DEPSFLAG} status=${D}? - if test ${D}{status} != 0 ; then - exit ${D}{status} - fi - # move created file to the location we want it in: + + # determine location of created files: while test ${D}# -gt 0; do case "${D}1" in -o ) @@ -51532,6 +49019,14 @@ if test ${D}DEPSMODE = gcc ; then done depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\` depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\` + + # if the compiler failed, we're done: + if test ${D}{status} != 0 ; then + rm -f ${D}depfile + exit ${D}{status} + fi + + # move created file to the location we want it in: if test -f ${D}depfile ; then sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d rm -f ${D}depfile @@ -51791,10 +49286,10 @@ fi - BAKEFILE_BAKEFILE_M4_VERSION="0.2.2" + BAKEFILE_BAKEFILE_M4_VERSION="0.2.3" -BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" +BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" @@ -51938,7 +49433,7 @@ D='$' cat <bk-make-pch #!/bin/sh -# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf +# This script is part of Bakefile (http://www.bakefile.org) autoconf # script. It is used to generated precompiled headers. # # Permission is given to use this file in any way. @@ -52120,19 +49615,14 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1="" - fi - COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" fi - COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1="" + COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" fi COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#" @@ -52175,19 +49665,14 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1="" - fi - COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_QA" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" fi - COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1="" + COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" fi COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#" @@ -52220,11 +49705,6 @@ EOF COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1="" - fi - COND_MONOLITHIC_0_USE_HTML_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_HTML" = "x1" ; then COND_MONOLITHIC_0_USE_HTML_1="" @@ -52235,9 +49715,9 @@ EOF COND_MONOLITHIC_0_USE_MEDIA_1="" fi - COND_MONOLITHIC_0_USE_ODBC_1="#" - if test "x$MONOLITHIC" = "x0" -a "x$USE_ODBC" = "x1" ; then - COND_MONOLITHIC_0_USE_ODBC_1="" + COND_MONOLITHIC_0_USE_PROPGRID_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then + COND_MONOLITHIC_0_USE_PROPGRID_1="" fi COND_MONOLITHIC_0_USE_QA_1="#" @@ -52300,39 +49780,29 @@ EOF COND_PLATFORM_MACOSX_1="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="" - fi - - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="" + COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then + COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="" fi - COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#" - if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then - COND_PLATFORM_MACOSX_1_TOOLKIT_X11="" + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" fi COND_PLATFORM_MACOSX_1_USE_GUI_1="#" @@ -52340,6 +49810,11 @@ EOF COND_PLATFORM_MACOSX_1_USE_GUI_1="" fi + COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then + COND_PLATFORM_MACOSX_1_USE_OPENGL_1="" + fi + COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" @@ -52350,6 +49825,11 @@ EOF COND_PLATFORM_MACOS_1="" fi + COND_PLATFORM_MAC_0="#" + if test "x$PLATFORM_MAC" = "x0" ; then + COND_PLATFORM_MAC_0="" + fi + COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then COND_PLATFORM_MAC_1="" @@ -52455,21 +49935,11 @@ EOF COND_SHARED_0_USE_STC_1="" fi - COND_SHARED_0_USE_XRC_1="#" - if test "x$SHARED" = "x0" -a "x$USE_XRC" = "x1" ; then - COND_SHARED_0_USE_XRC_1="" - fi - COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#" if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then COND_SHARED_0_WXUSE_EXPAT_BUILTIN="" fi - COND_SHARED_0_WXUSE_ODBC_BUILTIN="#" - if test "x$SHARED" = "x0" -a "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_SHARED_0_WXUSE_ODBC_BUILTIN="" - fi - COND_SHARED_0_WXUSE_REGEX_BUILTIN="#" if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then COND_SHARED_0_WXUSE_REGEX_BUILTIN="" @@ -52490,11 +49960,6 @@ EOF COND_SHARED_1_USE_GUI_1_USE_OPENGL_1="" fi - COND_SHARED_1_USE_XRC_1="#" - if test "x$SHARED" = "x1" -a "x$USE_XRC" = "x1" ; then - COND_SHARED_1_USE_XRC_1="" - fi - COND_TOOLKIT_="#" if test "x$TOOLKIT" = "x" ; then COND_TOOLKIT_="" @@ -52550,6 +50015,11 @@ EOF COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#" + if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="" + fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x" -a "x$USE_GUI" = "x1" ; then COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1="" @@ -52570,16 +50040,6 @@ EOF COND_TOOLKIT_MAC="" fi - COND_TOOLKIT_MAC_USE_GUI_1="#" - if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then - COND_TOOLKIT_MAC_USE_GUI_1="" - fi - - COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#" - if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then - COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="" - fi - COND_TOOLKIT_MGL="#" if test "x$TOOLKIT" = "xMGL" ; then COND_TOOLKIT_MGL="" @@ -52625,6 +50085,41 @@ EOF COND_TOOLKIT_MSW_WXUNIV_0="" fi + COND_TOOLKIT_OSX_CARBON="#" + if test "x$TOOLKIT" = "xOSX_CARBON" ; then + COND_TOOLKIT_OSX_CARBON="" + fi + + COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OSX_CARBON_USE_GUI_1="" + fi + + COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="" + fi + + COND_TOOLKIT_OSX_COCOA="#" + if test "x$TOOLKIT" = "xOSX_COCOA" ; then + COND_TOOLKIT_OSX_COCOA="" + fi + + COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#" + if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then + COND_TOOLKIT_OSX_COCOA_USE_GUI_1="" + fi + + COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="" + fi + + COND_TOOLKIT_OSX_IPHONE="#" + if test "x$TOOLKIT" = "xOSX_IPHONE" ; then + COND_TOOLKIT_OSX_IPHONE="" + fi + COND_TOOLKIT_PM="#" if test "x$TOOLKIT" = "xPM" ; then COND_TOOLKIT_PM="" @@ -52725,11 +50220,6 @@ EOF COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" fi - COND_USE_ODBC_1="#" - if test "x$USE_ODBC" = "x1" ; then - COND_USE_ODBC_1="" - fi - COND_USE_OPENGL_1="#" if test "x$USE_OPENGL" = "x1" ; then COND_USE_OPENGL_1="" @@ -52840,11 +50330,6 @@ EOF COND_WXUSE_LIBTIFF_BUILTIN="" fi - COND_WXUSE_ODBC_BUILTIN="#" - if test "x$wxUSE_ODBC" = "xbuiltin" ; then - COND_WXUSE_ODBC_BUILTIN="" - fi - COND_WXUSE_REGEX_BUILTIN="#" if test "x$wxUSE_REGEX" = "xbuiltin" ; then COND_WXUSE_REGEX_BUILTIN="" @@ -52938,7 +50423,7 @@ fi MACSETFILE="\$(SETFILE)" - if test "$wxUSE_MAC" = 1; then + if test "$wxUSE_OSX_CARBON" = 1; then POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" RESCOMP="$REZ" WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" @@ -52975,7 +50460,11 @@ echo "$as_me: WARNING: *** --enable-precomp-headers is not recommended" >&2;} echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;} fi - CPPFLAGS="-DWX_PRECOMP $CPPFLAGS" + # Our WX_PRECOMP flag does not make sense for any language except C++ because + # the headers that benefit from precompilation are mostly C++ headers. + CXXFLAGS="-DWX_PRECOMP $CXXFLAGS" + # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this: + #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS" fi @@ -52988,10 +50477,6 @@ if test "$wxUSE_MAC" = 1 ; then fi if test "$wxUSE_SHARED" = "yes"; then - - sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'` - EXE_LINKER=`eval echo "$sanitised_bakefile_mess"` - case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o" @@ -53000,10 +50485,6 @@ if test "$wxUSE_SHARED" = "yes"; then cp -p ${srcdir}/src/os2/dllar.sh . ;; esac -else - - EXE_LINKER="$CXX -o" - fi if test "$wxUSE_OMF" = "yes"; then case "${host}" in @@ -53020,7 +50501,7 @@ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $TOOLCHAIN_DEFS" case "${host}" in *-*-solaris2* ) - if "$GCC" = yes; then + if test "$GCC" = yes; then CPPFLAGS=`echo $CPPFLAGS | sed 's/-mt//'` LIBS=`echo $LIBS | sed 's/-mt//'` EXTRALIBS_GUI=`echo $EXTRALIBS_GUI | sed 's/-mt//'` @@ -53098,7 +50579,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 @@ -53149,6 +50629,9 @@ ac_config_files="$ac_config_files lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config. ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" +ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh" + + if test "$wx_cv_version_script" = "yes"; then ac_config_files="$ac_config_files version-script" @@ -53163,7 +50646,8 @@ ac_config_commands="$ac_config_commands wx-config" if test "$wxWITH_SUBDIRS" != "no"; then if test "$wxUSE_GUI" = "yes"; then SUBDIRS="samples demos utils" -else SUBDIRS="samples utils" +else + SUBDIRS="samples utils" fi @@ -53296,34 +50780,40 @@ echo "${ECHO_T}no" >&6; } -for subdir in `echo $SUBDIRS`; do +for subdir in $SUBDIRS; do if test -d ${srcdir}/${subdir} ; then if test "$wxUSE_GUI" = "yes"; then if test ${subdir} = "samples"; then makefiles="samples/Makefile.in $makefiles" - for sample in `echo $SAMPLES_SUBDIRS`; do + for sample in $SAMPLES_SUBDIRS; do if test -d $srcdir/samples/$sample; then makefiles="samples/$sample/Makefile.in $makefiles" fi done else - disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`; + disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'` eval "disabled=\$$disabled_var" disabled=/`echo X $disabled | sed 's@ @/|/@g'`/ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"` fi - else if test ${subdir} = "samples"; then - makefiles="samples/Makefile.in samples/console/Makefile.in" + else + if test ${subdir} = "samples"; then + makefiles="samples/Makefile.in $makefiles" + for sample in `echo $SAMPLES_SUBDIRS`; do + if test -d $srcdir/samples/$sample; then + makefiles="samples/$sample/Makefile.in $makefiles" + fi + done elif test ${subdir} = "utils"; then makefiles="" - for util in HelpGen tex2rtf ; do + for util in ifacecheck ; do if test -d $srcdir/utils/$util ; then - makefiles="utils/$util/Makefile.in \ - utils/$util/src/Makefile.in \ + makefiles="utils/$util/src/Makefile.in \ $makefiles" fi done - else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` + else + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` fi fi @@ -53911,6 +51401,7 @@ do "rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;; "lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;; "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;; + "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;; "version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;; @@ -54125,7 +51616,6 @@ STD_GUI_LIBS!$STD_GUI_LIBS$ac_delim wxUSE_ZLIB!$wxUSE_ZLIB$ac_delim wxUSE_REGEX!$wxUSE_REGEX$ac_delim wxUSE_EXPAT!$wxUSE_EXPAT$ac_delim -wxUSE_ODBC!$wxUSE_ODBC$ac_delim wxUSE_LIBJPEG!$wxUSE_LIBJPEG$ac_delim wxUSE_LIBPNG!$wxUSE_LIBPNG$ac_delim wxUSE_LIBTIFF!$wxUSE_LIBTIFF$ac_delim @@ -54140,10 +51630,11 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim EXTRALIBS!$EXTRALIBS$ac_delim EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim -EXTRALIBS_ODBC!$EXTRALIBS_ODBC$ac_delim +EXTRALIBS_MEDIA!$EXTRALIBS_MEDIA$ac_delim EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim +EXTRALIBS_STC!$EXTRALIBS_STC$ac_delim WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim @@ -54274,9 +51765,8 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_AUI_1$ac_de COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim -COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim -COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1$ac_delim +COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim @@ -54285,19 +51775,17 @@ COND_MONOLITHIC_0_SHARED_1_USE_AUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_AUI_1$ac_de COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim -COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim -COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1!$COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1$ac_delim +COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim COND_MONOLITHIC_0_USE_AUI_1!$COND_MONOLITHIC_0_USE_AUI_1$ac_delim COND_MONOLITHIC_0_USE_GUI_1!$COND_MONOLITHIC_0_USE_GUI_1$ac_delim COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim -COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_ODBC_1$ac_delim COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim -COND_MONOLITHIC_0_USE_ODBC_1!$COND_MONOLITHIC_0_USE_ODBC_1$ac_delim +COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim @@ -54310,16 +51798,16 @@ COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1!$COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1$a COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim -COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim +COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim +COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim +COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim @@ -54341,15 +51829,18 @@ COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIB COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim -COND_SHARED_0_USE_XRC_1!$COND_SHARED_0_USE_XRC_1$ac_delim COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim -COND_SHARED_0_WXUSE_ODBC_BUILTIN!$COND_SHARED_0_WXUSE_ODBC_BUILTIN$ac_delim COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim COND_SHARED_1!$COND_SHARED_1$ac_delim COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim -COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim +COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim +COND_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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54391,22 +51882,15 @@ _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_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_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 @@ -54416,6 +51900,13 @@ COND_TOOLKIT_MSW!$COND_TOOLKIT_MSW$ac_delim COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim +COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim +COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim +COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim +COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim +COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim @@ -54436,7 +51927,6 @@ COND_USE_GUI_1_WXUNIV_1!$COND_USE_GUI_1_WXUNIV_1$ac_delim COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim -COND_USE_ODBC_1!$COND_USE_ODBC_1$ac_delim COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim @@ -54459,7 +51949,6 @@ COND_WXUSE_EXPAT_BUILTIN!$COND_WXUSE_EXPAT_BUILTIN$ac_delim COND_WXUSE_LIBJPEG_BUILTIN!$COND_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_WXUSE_LIBPNG_BUILTIN!$COND_WXUSE_LIBPNG_BUILTIN$ac_delim COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim -COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim DEREZ!$DEREZ$ac_delim @@ -54487,7 +51976,9 @@ WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim -EXE_LINKER!$EXE_LINKER$ac_delim +GUIDIST!$GUIDIST$ac_delim +DISTDIR!$DISTDIR$ac_delim +SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54529,9 +52020,6 @@ _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 LDFLAGS_GL!$LDFLAGS_GL$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim DMALLOC_LIBS!$DMALLOC_LIBS$ac_delim @@ -54551,7 +52039,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -54960,6 +52448,7 @@ echo "$as_me: executing $ac_file commands" >&6;} ;; "lib/wx/config/${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ;; "lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ;; + "utils/ifacecheck/rungccxml.sh":F) chmod +x utils/ifacecheck/rungccxml.sh ;; "wx-config":C) rm -f wx-config ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config ;; @@ -55209,7 +52698,6 @@ if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then echo " xpm ${wxUSE_LIBXPM-none}" fi echo " zlib ${wxUSE_ZLIB}" -echo " odbc ${wxUSE_ODBC}" echo " expat ${wxUSE_EXPAT}" echo " libmspack ${wxUSE_LIBMSPACK}" echo " sdl ${wxUSE_LIBSDL}"