X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bef5e9e5f61f767c368966c1f4869e96e1fd664c..c615a3f57b83fa29957c6b7568535201ee43da25:/configure diff --git a/configure b/configure index f6473a0b50..56ccf84904 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 49606 2007-11-03 16:14:28Z PC . +# From configure.in Id: configure.in 50303 2007-11-28 06:46:25Z PC . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -737,6 +737,7 @@ CXXWARNINGS EXTRALIBS EXTRALIBS_XML EXTRALIBS_HTML +EXTRALIBS_MEDIA EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL @@ -869,6 +870,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11 COND_PLATFORM_MACOSX_1_USE_GUI_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOS_1 +COND_PLATFORM_MAC_1 COND_PLATFORM_MSDOS_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 @@ -880,6 +882,9 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 +COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 +COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 +COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN @@ -901,6 +906,7 @@ 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 @@ -1665,6 +1671,7 @@ Optional Features: --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.) @@ -1774,6 +1781,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 @@ -1837,7 +1845,7 @@ Optional Features: --enable-icocur 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) --disable-largefile omit support for large files @@ -2906,14 +2914,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 @@ -2929,8 +2929,10 @@ 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 @@ -2944,21 +2946,6 @@ DEFAULT_wxUSE_GTK2=yes DEFAULT_wxUSE_OBJC_UNIQUIFYING=no -for toolkit in $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 - - @@ -2982,27 +2969,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 @@ -3038,27 +3013,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 @@ -3094,27 +3057,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 @@ -3150,27 +3101,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 @@ -3212,27 +3151,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 @@ -3277,27 +3204,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 @@ -3337,27 +3252,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 @@ -3468,27 +3371,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 @@ -3530,27 +3421,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 @@ -3587,27 +3466,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 @@ -3647,27 +3514,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 @@ -3707,27 +3562,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 @@ -3767,27 +3610,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 @@ -3828,27 +3659,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 @@ -3884,27 +3703,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 @@ -3940,27 +3747,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 @@ -3996,27 +3791,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 @@ -4052,27 +3835,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 @@ -4108,27 +3879,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 @@ -4167,27 +3926,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 @@ -4223,27 +3970,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 @@ -4278,27 +4013,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 @@ -4338,27 +4061,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 @@ -4398,27 +4109,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 @@ -4447,18 +4146,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 @@ -4473,19 +4160,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 @@ -4514,27 +4188,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 @@ -4570,27 +4232,15 @@ if test "${enable_optimise+set}" = set; then 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 @@ -4626,27 +4276,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 @@ -4682,27 +4320,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 @@ -4738,27 +4364,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 @@ -4794,27 +4408,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 @@ -4850,27 +4452,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 @@ -4906,27 +4496,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 @@ -4949,27 +4527,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; } @@ -4995,27 +4561,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 @@ -5051,27 +4605,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 @@ -5086,7 +4628,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= @@ -5109,27 +4651,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 @@ -5177,27 +4707,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 @@ -5233,27 +4751,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 @@ -5289,27 +4795,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 @@ -5345,27 +4839,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 @@ -5401,27 +4883,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 @@ -5457,27 +4927,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 @@ -5513,27 +4971,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 @@ -5569,27 +5015,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 @@ -5625,27 +5059,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 @@ -5681,27 +5103,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 @@ -5737,27 +5147,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 @@ -5780,27 +5178,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; } @@ -5827,27 +5213,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 @@ -5883,27 +5257,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 @@ -5940,27 +5302,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 @@ -5997,27 +5347,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 @@ -6054,27 +5392,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 @@ -6112,27 +5438,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 @@ -6168,27 +5482,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 @@ -6225,27 +5527,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 @@ -6281,27 +5571,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 @@ -6337,27 +5615,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 @@ -6393,27 +5659,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 @@ -6449,27 +5703,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 @@ -6485,6 +5727,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 @@ -6505,27 +5791,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 @@ -6561,27 +5835,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 @@ -6618,27 +5880,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 @@ -6675,27 +5925,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 @@ -6731,27 +5969,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 @@ -6787,27 +6013,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 @@ -6844,27 +6058,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 @@ -6900,27 +6102,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 @@ -6956,27 +6146,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 @@ -7012,27 +6190,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 @@ -7068,27 +6234,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 @@ -7124,27 +6278,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 @@ -7180,27 +6322,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 @@ -7236,27 +6366,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 @@ -7292,27 +6410,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 @@ -7348,27 +6454,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 @@ -7404,27 +6498,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 @@ -7460,27 +6542,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 @@ -7516,27 +6586,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 @@ -7572,27 +6630,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 @@ -7628,27 +6674,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 @@ -7684,27 +6718,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 @@ -7740,27 +6762,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 @@ -7796,27 +6806,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 @@ -7852,27 +6850,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 @@ -7908,27 +6894,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 @@ -7964,27 +6938,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 @@ -8020,27 +6982,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 @@ -8076,27 +7026,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 @@ -8132,27 +7070,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 @@ -8188,27 +7114,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 @@ -8244,27 +7158,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 @@ -8300,27 +7202,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 @@ -8356,27 +7246,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 @@ -8412,27 +7290,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 @@ -8468,27 +7334,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 @@ -8524,27 +7378,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 @@ -8580,27 +7422,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 @@ -8636,27 +7466,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 @@ -8692,27 +7510,15 @@ if test "${enable_sound+set}" = set; then 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 @@ -8748,27 +7554,15 @@ if test "${enable_mediactrl+set}" = set; then 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 @@ -8804,27 +7598,15 @@ if test "${enable_gstreamer8+set}" = set; then 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 @@ -8860,27 +7642,15 @@ if test "${enable_printfposparam+set}" = set; then else wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=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}" 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 if test x"$enablestring" = xdisable; then if test $wxUSE_PRINTF_POS_PARAMS = yes; then @@ -8916,27 +7686,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 @@ -8973,27 +7731,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 @@ -9029,27 +7775,15 @@ if test "${enable_variant+set}" = set; then 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 @@ -9085,27 +7819,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 @@ -9141,27 +7863,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 @@ -9197,27 +7907,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 @@ -9253,27 +7951,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 @@ -9310,27 +7996,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 @@ -9367,27 +8041,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 @@ -9423,27 +8085,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 @@ -9483,27 +8133,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 @@ -9539,27 +8177,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 @@ -9595,27 +8221,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 @@ -9651,27 +8265,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 @@ -9707,27 +8309,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 @@ -9763,27 +8353,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 @@ -9819,27 +8397,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 @@ -9875,27 +8441,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 @@ -9931,27 +8485,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 @@ -9987,27 +8529,15 @@ if test "${enable_printarch+set}" = set; then else wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=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}" 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 if test x"$enablestring" = xdisable; then if test $wxUSE_PRINTING_ARCHITECTURE = yes; then @@ -10043,27 +8573,15 @@ if test "${enable_mdi+set}" = set; then else wx_cv_use_mdi='wxUSE_MDI=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}" fi eval "$wx_cv_use_mdi" - if test "x$cache" = xyes; then - echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_MDI = yes; then @@ -10099,27 +8617,15 @@ if test "${enable_mdidoc+set}" = set; then else wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=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}" 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 if test x"$enablestring" = xdisable; then if test $wxUSE_MDI_ARCHITECTURE = yes; then @@ -10155,27 +8661,15 @@ if test "${enable_loggui+set}" = set; then else wx_cv_use_loggui='wxUSE_LOGGUI=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}" fi eval "$wx_cv_use_loggui" - if test "x$cache" = xyes; then - echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LOGGUI = yes; then @@ -10211,27 +8705,15 @@ if test "${enable_logwin+set}" = set; then else wx_cv_use_logwin='wxUSE_LOGWINDOW=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}" fi eval "$wx_cv_use_logwin" - if test "x$cache" = xyes; then - echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LOGWINDOW = yes; then @@ -10267,27 +8749,15 @@ if test "${enable_logdialog+set}" = set; then else wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' fi - cache=yes else - LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - cache=yes - else - cache=no - fi - wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" fi eval "$wx_cv_use_logdialog" - if test "x$cache" = xyes; then - echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp - fi if test x"$enablestring" = xdisable; then if test $wxUSE_LOGDIALOG = yes; then @@ -10323,27 +8793,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 @@ -10379,27 +8837,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 @@ -10435,27 +8881,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 @@ -10491,27 +8925,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 @@ -10547,27 +8969,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 @@ -10605,27 +9015,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 @@ -10661,27 +9059,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 @@ -10717,27 +9103,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 @@ -10776,27 +9150,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 @@ -10943,27 +9305,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 @@ -10999,27 +9349,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 @@ -11055,27 +9393,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 @@ -11111,27 +9437,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 @@ -11167,27 +9481,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 @@ -11223,27 +9525,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 @@ -11279,27 +9569,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 @@ -11335,27 +9613,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 @@ -11391,27 +9657,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 @@ -11447,27 +9701,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 @@ -11503,27 +9745,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 @@ -11559,27 +9789,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 @@ -11615,27 +9833,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 @@ -11671,27 +9877,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 @@ -11727,27 +9921,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 @@ -11783,27 +9965,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 @@ -11839,27 +10009,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 @@ -11895,27 +10053,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 @@ -11951,27 +10097,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 @@ -12007,27 +10141,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 @@ -12063,27 +10185,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 @@ -12119,27 +10229,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 @@ -12175,27 +10273,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 @@ -12231,27 +10317,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 @@ -12287,27 +10361,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 @@ -12343,27 +10405,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 @@ -12399,27 +10449,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 @@ -12455,27 +10493,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 @@ -12511,27 +10537,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 @@ -12567,27 +10581,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 @@ -12623,27 +10625,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 @@ -12679,27 +10669,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 @@ -12715,6 +10693,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 @@ -12735,27 +10757,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 @@ -12791,27 +10801,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 @@ -12847,27 +10845,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 @@ -12903,27 +10889,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 @@ -12959,27 +10933,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 @@ -13015,27 +10977,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 @@ -13071,27 +11021,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 @@ -13127,27 +11065,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 @@ -13183,27 +11109,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 @@ -13239,27 +11153,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 @@ -13295,27 +11197,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 @@ -13351,27 +11241,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 @@ -13407,27 +11285,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 @@ -13463,27 +11329,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 @@ -13519,27 +11373,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 @@ -13575,27 +11417,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 @@ -13631,27 +11461,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 @@ -13687,27 +11505,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 @@ -13743,27 +11549,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 @@ -13799,27 +11593,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 @@ -13855,27 +11637,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 @@ -13911,27 +11681,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 @@ -13967,27 +11725,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 @@ -14023,27 +11769,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 @@ -14079,27 +11813,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 @@ -14135,27 +11857,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 @@ -14193,27 +11903,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 @@ -14249,27 +11947,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 @@ -14305,27 +11991,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 @@ -14361,27 +12035,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 @@ -14417,27 +12079,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 @@ -14473,27 +12123,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 @@ -14529,27 +12167,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 @@ -14585,27 +12211,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 @@ -14641,27 +12255,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 @@ -14697,27 +12299,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 @@ -14753,27 +12343,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 @@ -14809,27 +12387,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 @@ -14865,27 +12431,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 @@ -14921,27 +12475,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 @@ -14977,27 +12519,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 @@ -15035,27 +12565,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 @@ -15091,27 +12609,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 @@ -15147,27 +12653,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 @@ -15203,27 +12697,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 @@ -15259,27 +12741,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 @@ -15315,27 +12785,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 @@ -15371,27 +12829,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 @@ -15427,27 +12873,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 @@ -15483,27 +12917,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 @@ -15539,27 +12961,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 @@ -15595,27 +13005,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 @@ -15653,27 +13051,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 @@ -15709,27 +13095,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 @@ -15765,27 +13139,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 @@ -15821,27 +13183,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 @@ -15877,27 +13227,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 @@ -15933,27 +13271,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 @@ -15989,27 +13315,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 @@ -16045,27 +13359,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 @@ -16101,27 +13403,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 @@ -16159,27 +13449,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 @@ -16215,27 +13493,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 @@ -16271,27 +13537,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 @@ -16327,27 +13581,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 @@ -16383,27 +13625,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 @@ -16422,11 +13652,6 @@ echo "${ECHO_T}$result" >&6; } fi - echo "saving argument cache $wx_arg_cache_file" - mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file} - - - { echo "$as_me:$LINENO: checking for toolkit" >&5 echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; } @@ -16465,16 +13690,7 @@ echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;} done else for toolkit in $ALL_TOOLKITS; do - if test "$has_toolkit_in_cache" != 1; then - var=DEFAULT_DEFAULT_wxUSE_$toolkit - else - var=DEFAULT_wxUSE_$toolkit - - eval "version=\$DEFAULT_wx${toolkit}_VERSION" - if test "x$version" != "x"; then - eval "wx${toolkit}_VERSION=$version" - fi - fi + var=DEFAULT_DEFAULT_wxUSE_$toolkit eval "wxUSE_$toolkit=\$${var}" done fi @@ -16497,8 +13713,8 @@ echo "$as_me: error: Please specify a toolkit -- cannot determine the default fo { (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;} + { { 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 @@ -16509,25 +13725,14 @@ echo "$as_me: error: Please specify at most one toolkit (maybe some are cached i wxGTK_VERSION=1 fi - for toolkit in $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 + 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` + 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 @@ -24639,7 +21844,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 ;; @@ -25575,7 +22780,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 @@ -27047,7 +24252,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; }; } @@ -27192,7 +24397,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; }; } @@ -27584,7 +24789,7 @@ int main () { - int value=0; + unsigned int value=0; __sync_fetch_and_add(&value, 1); __sync_sub_and_fetch(&value, 1); @@ -27592,14 +24797,14 @@ main () 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 @@ -27608,7 +24813,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 @@ -27617,7 +24823,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 @@ -29161,24 +26368,24 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i fi -TIFF_LINK= -TIFF_PREREQ_LINKS=-lm -if test "$wxUSE_LIBTIFF" != "no" ; then +JPEG_LINK= +if test "$wxUSE_LIBJPEG" != "no" ; then cat >>confdefs.h <<\_ACEOF -#define wxUSE_LIBTIFF 1 +#define wxUSE_LIBJPEG 1 _ACEOF - if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then - if test "$wxUSE_LIBJPEG" = "sys"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" - fi - if test "$wxUSE_ZLIB" = "sys"; then - TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" - fi - { echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } -if test "${ac_cv_header_tiffio_h+set}" = set; then + if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then + { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&5 +echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&2;} + wxUSE_LIBJPEG=sys + fi + + if test "$wxUSE_MGL" != 1 ; then + if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then + { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } + if test "${ac_cv_header_jpeglib_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -29188,9 +26395,18 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ + #undef HAVE_STDLIB_H + #include + #include + +int +main () +{ -#include + ; + return 0; +} _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29209,27 +26425,30 @@ 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_tiffio_h=yes + ac_cv_header_jpeglib_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_tiffio_h=no + ac_cv_header_jpeglib_h=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } -if test $ac_cv_header_tiffio_h = yes; then - { echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5 -echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6; } -if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then + { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } + + if test "$ac_cv_header_jpeglib_h" = "yes"; then + { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; } +if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS" +LIBS="-ljpeg $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -29243,11 +26462,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif -char TIFFError (); +char jpeg_read_header (); int main () { -return TIFFError (); +return jpeg_read_header (); ; return 0; } @@ -29270,68 +26489,104 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then - ac_cv_lib_tiff_TIFFError=yes + ac_cv_lib_jpeg_jpeg_read_header=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_tiff_TIFFError=no + ac_cv_lib_jpeg_jpeg_read_header=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_tiff_TIFFError" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6; } -if test $ac_cv_lib_tiff_TIFFError = yes; then - TIFF_LINK=" -ltiff" -fi - - +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; } +if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then + JPEG_LINK=" -ljpeg" fi + fi - - if test "x$TIFF_LINK" = "x" ; then - if test "$wxUSE_LIBTIFF" = "sys" ; then - { { echo "$as_me:$LINENO: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&5 -echo "$as_me: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&2;} + if test "x$JPEG_LINK" = "x" ; then + if test "$wxUSE_LIBJPEG" = "sys" ; then + { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5 +echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&2;} { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5 +echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} + wxUSE_LIBJPEG=builtin + fi else - { echo "$as_me:$LINENO: WARNING: system tiff library not found, will use built-in instead" >&5 -echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;} - wxUSE_LIBTIFF=builtin - fi - else - wxUSE_LIBTIFF=sys - fi - fi - if test "$wxUSE_LIBTIFF" = "builtin" ; then - subdirs="$subdirs src/tiff" + wxUSE_LIBJPEG=sys - fi + if test "$wxUSE_MSW" = 1; then + { echo "$as_me:$LINENO: checking for boolean" >&5 +echo $ECHO_N "checking for boolean... $ECHO_C" >&6; } +if test "${ac_cv_type_boolean+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +typedef boolean 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_boolean=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_boolean=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 +echo "${ECHO_T}$ac_cv_type_boolean" >&6; } +if test $ac_cv_type_boolean = yes; then -JPEG_LINK= -if test "$wxUSE_LIBJPEG" != "no" ; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_LIBJPEG 1 +cat >>confdefs.h <<_ACEOF +#define HAVE_BOOLEAN 1 _ACEOF - if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBJPEG" = "builtin" ; then - { echo "$as_me:$LINENO: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&5 -echo "$as_me: WARNING: wxMGL doesn't work with builtin jpeg library, will use MGL one instead" >&2;} - wxUSE_LIBJPEG=sys - fi - - if test "$wxUSE_MGL" != 1 ; then - if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then - { echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6; } - if test "${ac_cv_header_jpeglib_h+set}" = set; then + { echo "$as_me:$LINENO: checking for boolean" >&5 +echo $ECHO_N "checking for boolean... $ECHO_C" >&6; } +if test "${ac_cv_type_boolean+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -29341,283 +26596,82 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #undef HAVE_STDLIB_H - #include - #include + #undef HAVE_BOOLEAN + #include + #include + +typedef boolean 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_boolean=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - - ; - 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_header_jpeglib_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_jpeglib_h=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi - - { echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6; } - - if test "$ac_cv_header_jpeglib_h" = "yes"; then - { echo "$as_me:$LINENO: checking for jpeg_read_header in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_read_header in -ljpeg... $ECHO_C" >&6; } -if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $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 jpeg_read_header (); -int -main () -{ -return jpeg_read_header (); - ; - 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_jpeg_jpeg_read_header=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_jpeg_jpeg_read_header=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_jpeg_jpeg_read_header" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then - JPEG_LINK=" -ljpeg" -fi - - fi - - if test "x$JPEG_LINK" = "x" ; then - if test "$wxUSE_LIBJPEG" = "sys" ; then - { { echo "$as_me:$LINENO: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&5 -echo "$as_me: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" >&2;} - { (exit 1); exit 1; }; } - else - { echo "$as_me:$LINENO: WARNING: system jpeg library not found, will use built-in instead" >&5 -echo "$as_me: WARNING: system jpeg library not found, will use built-in instead" >&2;} - wxUSE_LIBJPEG=builtin - fi - else - wxUSE_LIBJPEG=sys - - if test "$wxUSE_MSW" = 1; then - { echo "$as_me:$LINENO: checking for boolean" >&5 -echo $ECHO_N "checking for boolean... $ECHO_C" >&6; } -if test "${ac_cv_type_boolean+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -typedef boolean 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_boolean=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_boolean=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 -echo "${ECHO_T}$ac_cv_type_boolean" >&6; } -if test $ac_cv_type_boolean = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_BOOLEAN 1 -_ACEOF - - - { echo "$as_me:$LINENO: checking for boolean" >&5 -echo $ECHO_N "checking for boolean... $ECHO_C" >&6; } -if test "${ac_cv_type_boolean+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. */ - - #undef HAVE_BOOLEAN - #include - #include - - -typedef boolean 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_boolean=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_type_boolean=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 -echo "${ECHO_T}$ac_cv_type_boolean" >&6; } - -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ echo "$as_me:$LINENO: checking size of boolean" >&5 -echo $ECHO_N "checking size of boolean... $ECHO_C" >&6; } -if test "${ac_cv_sizeof_boolean+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #undef HAVE_BOOLEAN - #include - #include - - - typedef boolean ac__type_sizeof_; -int -main () -{ -static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; -test_array [0] = 0 + ac_cv_type_boolean=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_boolean" >&5 +echo "${ECHO_T}$ac_cv_type_boolean" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of boolean" >&5 +echo $ECHO_N "checking size of boolean... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_boolean+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #undef HAVE_BOOLEAN + #include + #include + + + typedef boolean ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 ; return 0; @@ -29981,9 +27035,161 @@ fi fi fi fi +fi + + +TIFF_LINK= +TIFF_PREREQ_LINKS=-lm +if test "$wxUSE_LIBTIFF" != "no" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_LIBTIFF 1 +_ACEOF + + + if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then + if test "$wxUSE_LIBJPEG" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK" + fi + if test "$wxUSE_ZLIB" = "sys"; then + TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" + fi + { echo "$as_me:$LINENO: checking for tiffio.h" >&5 +echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6; } +if test "${ac_cv_header_tiffio_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_tiffio_h=yes else - if test "$wxUSE_LIBTIFF" = "builtin"; then - ac_configure_args="$ac_configure_args --disable-jpeg" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_tiffio_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 +echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6; } +if test $ac_cv_header_tiffio_h = yes; then + + { echo "$as_me:$LINENO: checking for TIFFError in -ltiff" >&5 +echo $ECHO_N "checking for TIFFError in -ltiff... $ECHO_C" >&6; } +if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltiff $TIFF_PREREQ_LINKS $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 TIFFError (); +int +main () +{ +return TIFFError (); + ; + 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_tiff_TIFFError=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_tiff_TIFFError=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_tiff_TIFFError" >&5 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFError" >&6; } +if test $ac_cv_lib_tiff_TIFFError = yes; then + TIFF_LINK=" -ltiff" +fi + + +fi + + + + if test "x$TIFF_LINK" = "x" ; then + if test "$wxUSE_LIBTIFF" = "sys" ; then + { { echo "$as_me:$LINENO: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&5 +echo "$as_me: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: WARNING: system tiff library not found, will use built-in instead" >&5 +echo "$as_me: WARNING: system tiff library not found, will use built-in instead" >&2;} + wxUSE_LIBTIFF=builtin + fi + else + wxUSE_LIBTIFF=sys + fi + fi + if test "$wxUSE_LIBTIFF" = "builtin" ; then + if test "$wxUSE_LIBJPEG" = "no"; then + ac_configure_args="$ac_configure_args --disable-jpeg" + fi + subdirs="$subdirs src/tiff" + fi fi @@ -30552,7 +27758,7 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK12= WXGTK127= - WXGTK20= + WXGTK2= WXGPE= if test "$wxUSE_COCOA" = 1 ; then @@ -30685,7 +27891,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; } @@ -31603,7 +28809,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 @@ -31631,86 +28837,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 @@ -31758,10 +28890,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 @@ -31825,10 +28953,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 @@ -31846,68 +28970,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 @@ -34494,9 +31556,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 @@ -34568,7 +31630,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 @@ -35142,7 +32204,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 @@ -35168,9 +32230,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 @@ -35537,11 +32599,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_MAC" = 1 -o "$wxUSE_COCOA" = 1; then OPENGL_LIBS="-framework OpenGL -framework AGL" elif test "$wxUSE_MSW" = 1; then OPENGL_LIBS="-lopengl32 -lglu32" @@ -36397,7 +33459,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}" @@ -36646,157 +33708,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 @@ -36805,29 +33741,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 @@ -39037,7 +36061,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 @@ -43582,9 +40606,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 @@ -44356,7 +41380,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; } @@ -44484,7 +41508,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. @@ -44821,7 +41845,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 @@ -45442,7 +42466,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 @@ -46505,7 +43529,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" @@ -46824,76 +43848,163 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockname3=int + wx_cv_type_getsockname3=int +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_type_getsockname3=unknown + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + CFLAGS="$CFLAGS_OLD" + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5 +echo "${ECHO_T}$wx_cv_type_getsockname3" >&6; } + + if test "$wx_cv_type_getsockname3" = "unknown"; then + wxUSE_SOCKETS=no + { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 +echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} + else + cat >>confdefs.h <<_ACEOF +#define WX_SOCKLEN_T $wx_cv_type_getsockname3 +_ACEOF + + fi + { echo "$as_me:$LINENO: checking what is the type of the fifth argument of getsockopt" >&5 +echo $ECHO_N "checking what is the type of the fifth argument of getsockopt... $ECHO_C" >&6; } +if test "${wx_cv_type_getsockopt5+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + socklen_t len; + getsockopt(0, 0, 0, 0, &len); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_type_getsockopt5=socklen_t +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + size_t len; + getsockopt(0, 0, 0, 0, &len); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_type_getsockopt5=size_t else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_type_getsockname3=unknown - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - CFLAGS="$CFLAGS_OLD" - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockname3" >&5 -echo "${ECHO_T}$wx_cv_type_getsockname3" >&6; } - - if test "$wx_cv_type_getsockname3" = "unknown"; then - wxUSE_SOCKETS=no - { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 -echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else - cat >>confdefs.h <<_ACEOF -#define WX_SOCKLEN_T $wx_cv_type_getsockname3 -_ACEOF - - fi - { echo "$as_me:$LINENO: checking what is the type of the fifth argument of getsockopt" >&5 -echo $ECHO_N "checking what is the type of the fifth argument of getsockopt... $ECHO_C" >&6; } -if test "${wx_cv_type_getsockopt5+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include int main () { - socklen_t len; - getsockopt(0, 0, 0, 0, &len); + int len; + getsockopt(0, 0, 0, 0, &len); ; return 0; @@ -46916,71 +44027,73 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=socklen_t + wx_cv_type_getsockopt5=int else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + wx_cv_type_getsockopt5=unknown - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ +fi - #include - #include +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -int -main () -{ +fi - size_t len; - getsockopt(0, 0, 0, 0, &len); +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ; - return 0; -} + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5 +echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; } + + if test "$wx_cv_type_getsockopt5" = "unknown"; then + wxUSE_SOCKETS=no + { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 +echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} + else + cat >>confdefs.h <<_ACEOF +#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=size_t + + fi + fi +fi + +if test "$wxUSE_SOCKETS" = "yes" ; then + if test "$wxUSE_IPV6" = "yes"; then + { echo "$as_me:$LINENO: checking whether we have sockaddr_in6" >&5 +echo $ECHO_N "checking whether we have sockaddr_in6... $ECHO_C" >&6; } +if test "${wx_cv_type_sockaddr_in6+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include - #include + #include + #include + #include int main () { - int len; - getsockopt(0, 0, 0, 0, &len); + struct sockaddr_in6 sa6; ; return 0; @@ -47000,53 +44113,36 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { - test -z "$ac_cxx_werror_flag" || + test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_type_getsockopt5=int + wx_cv_type_sockaddr_in6=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_type_getsockopt5=unknown + wx_cv_type_sockaddr_in6=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - fi -{ echo "$as_me:$LINENO: result: $wx_cv_type_getsockopt5" >&5 -echo "${ECHO_T}$wx_cv_type_getsockopt5" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_type_sockaddr_in6" >&5 +echo "${ECHO_T}$wx_cv_type_sockaddr_in6" >&6; } - if test "$wx_cv_type_getsockopt5" = "unknown"; then - wxUSE_SOCKETS=no - { echo "$as_me:$LINENO: WARNING: Couldn't find socklen_t synonym for this system" >&5 -echo "$as_me: WARNING: Couldn't find socklen_t synonym for this system" >&2;} - else - cat >>confdefs.h <<_ACEOF -#define SOCKOPTLEN_T $wx_cv_type_getsockopt5 + if test "$wx_cv_type_sockaddr_in6"="yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_IPV6 1 _ACEOF + else + { echo "$as_me:$LINENO: WARNING: IPv6 support not available... disabled" >&5 +echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;} fi fi -fi -if test "$wxUSE_SOCKETS" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SOCKETS 1 _ACEOF @@ -47194,7 +44290,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 @@ -48010,6 +45106,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 @@ -48700,6 +45803,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 @@ -48716,13 +45829,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 @@ -48758,7 +45864,7 @@ 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 @@ -49030,7 +46136,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 @@ -49219,6 +46325,7 @@ LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" +EXTRALIBS_MEDIA="$GST_LIBS" EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" 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` @@ -49267,7 +46374,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 @@ -49334,7 +46441,8 @@ fi -TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr A-Z a-z` + +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'` @@ -49346,7 +46454,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"; @@ -49406,7 +46514,7 @@ else if $CXX -o conftest$PROGRAM_EXT conftest.cpp >/dev/null 2>&1 then - if tr -dc a-z < conftest$PROGRAM_EXT | + if tr -dc '[a-z]' < conftest$PROGRAM_EXT | grep awidetest >/dev/null then wx_cv_gcc_pch_bug=no @@ -51934,6 +49042,11 @@ EOF COND_PLATFORM_MACOS_1="" fi + COND_PLATFORM_MAC_1="#" + if test "x$PLATFORM_MAC" = "x1" ; then + COND_PLATFORM_MAC_1="" + fi + COND_PLATFORM_MSDOS_1="#" if test "x$PLATFORM_MSDOS" = "x1" ; then COND_PLATFORM_MSDOS_1="" @@ -51989,6 +49102,21 @@ EOF COND_SHARED_0="" fi + COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#" + if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then + COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="" + fi + + COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#" + if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then + COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="" + fi + + COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#" + if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then + COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="" + fi + COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#" if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="" @@ -52094,6 +49222,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="" @@ -52828,7 +49961,7 @@ for subdir in $SUBDIRS; do 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"` @@ -53662,6 +50795,7 @@ CXXWARNINGS!$CXXWARNINGS$ac_delim EXTRALIBS!$EXTRALIBS$ac_delim EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim EXTRALIBS_HTML!$EXTRALIBS_HTML$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 @@ -53734,7 +50868,6 @@ ICC_PCH!$ICC_PCH$ac_delim BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim -COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53776,6 +50909,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim @@ -53835,6 +50969,7 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_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_1!$COND_PLATFORM_MAC_1$ac_delim COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim @@ -53846,6 +50981,9 @@ COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim COND_SHARED_0!$COND_SHARED_0$ac_delim +COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim +COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim +COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim @@ -53867,12 +51005,7 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim -COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim -COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim -COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim -COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim -COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53914,6 +51047,12 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -54005,6 +51144,47 @@ WX_RESOURCES_MACOSX_ASCII!$WX_RESOURCES_MACOSX_ASCII$ac_delim WX_RESOURCES_MACOSX_DATA!$WX_RESOURCES_MACOSX_DATA$ac_delim LIBWXMACRES!$LIBWXMACRES$ac_delim POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF MACSETFILE!$MACSETFILE$ac_delim GCC!$GCC$ac_delim DLLTOOL!$DLLTOOL$ac_delim @@ -54013,7 +51193,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` = 97; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -54031,8 +51211,8 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g @@ -54045,6 +51225,8 @@ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n ' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g CEOF$ac_eof _ACEOF @@ -54292,7 +51474,7 @@ s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&