X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0295153cbc236a8809b2a066b8c0a12648ca1ff4..57c2270cd7ded46f390cef5f2447e54132828902:/configure diff --git a/configure b/configure index eb91305089..285c35de90 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47617 2007-07-21 13:01:28Z VZ . +# From configure.in Id: configure.in 47800 2007-07-29 00:28:07Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -1666,7 +1666,7 @@ Optional Features: --enable-permissive compile code disregarding strict ANSI --enable-no_deps create code without dependency information --disable-vararg_macros don't use vararg macros, even if they are supported - --enable-universal_binary[=SDK] create Mac PowerPC and Intel Universal binary (not yet working) + --enable-universal_binary create Mac PowerPC and Intel Universal binary (not yet working) --enable-compat26 enable wxWidgets 2.6 compatibility --disable-compat28 disable wxWidgets 2.8 compatibility --disable-rpath disable use of rpath for uninstalled builds @@ -1847,7 +1847,9 @@ Optional Features: --enable-xpm use xpm images (XPM file format) --enable-icocur use Windows ICO and CUR formats --enable-dccache cache temporary wxDC objects (Win32 only) + --enable-iniconf use wxIniConfig (Win32 only) --enable-ps-in-msw use PS printing in wxMSW (Win32 only) + --enable-ownerdrawn use owner drawn controls (Win32 only) --enable-regkey use wxRegKey class (Win32 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) @@ -1894,6 +1896,8 @@ Optional Packages: --with-zlib use zlib for LZW compression --with-odbc use the IODBC and wxODBC classes --with-expat enable XML support using expat parser + --with-macosx-sdk=PATH use an OS X SDK at PATH + --with-macosx-version-min=VER build binaries which require at least this OS X version --with-gtk-prefix=PFX Prefix where GTK is installed (optional) --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional) --with-x use the X Window System @@ -2941,6 +2945,8 @@ DEFAULT_wxUSE_TAB_DIALOG=no DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no +DEFAULT_wxUSE_UNIVERSAL_BINARY=no + DEFAULT_wxUSE_OFFICIAL_BUILD=no DEFAULT_wxUSE_GTK2=yes @@ -2992,7 +2998,10 @@ else LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" @@ -3045,7 +3054,10 @@ else LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" @@ -3098,7 +3110,10 @@ else LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" @@ -3151,7 +3166,10 @@ else LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" @@ -3160,7 +3178,7 @@ fi eval "$wx_cv_use_subdirs" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp fi @@ -3210,7 +3228,10 @@ else LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" @@ -3272,7 +3293,10 @@ else LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" @@ -3329,7 +3353,10 @@ else LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" @@ -3457,7 +3484,10 @@ else LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" @@ -3516,7 +3546,10 @@ else LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" @@ -3570,7 +3603,10 @@ else LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" @@ -3627,7 +3663,10 @@ else LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" @@ -3684,7 +3723,10 @@ else LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" @@ -3741,7 +3783,10 @@ else LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" @@ -3799,7 +3844,10 @@ else LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" @@ -3808,7 +3856,7 @@ fi eval "$wx_cv_use_libmspack" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp fi @@ -3852,7 +3900,10 @@ else LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" @@ -3861,7 +3912,7 @@ fi eval "$wx_cv_use_gnomeprint" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp fi @@ -3905,7 +3956,10 @@ else LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" @@ -3914,7 +3968,7 @@ fi eval "$wx_cv_use_gnomevfs" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp fi @@ -3958,7 +4012,10 @@ else LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" @@ -3967,7 +4024,7 @@ fi eval "$wx_cv_use_hildon" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp fi @@ -4011,7 +4068,10 @@ else LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" @@ -4020,7 +4080,7 @@ fi eval "$wx_cv_use_opengl" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp fi @@ -4067,7 +4127,10 @@ else LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" @@ -4076,7 +4139,7 @@ fi eval "$wx_cv_use_dmalloc" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp fi @@ -4120,7 +4183,10 @@ else LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" @@ -4129,7 +4195,7 @@ fi eval "$wx_cv_use_sdl" - if test "x$cache" != xyes; then + if test "x$cache" = xyes; then echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp fi @@ -4172,7 +4238,10 @@ else LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" @@ -4229,7 +4298,10 @@ else LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" @@ -4286,7 +4358,10 @@ else LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" @@ -4343,7 +4418,10 @@ else LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" @@ -4375,6 +4453,59 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or fi +{ echo "$as_me:$LINENO: checking for --with-macosx-sdk" >&5 +echo $ECHO_N "checking for --with-macosx-sdk... $ECHO_C" >&6; } + +# Check whether --with-macosx-sdk was given. +if test "${with_macosx_sdk+set}" = set; then + withval=$with_macosx_sdk; + wxUSE_MACOSX_SDK=$withval + wx_cv_use_macosx_sdk="wxUSE_MACOSX_SDK=$withval" + echo "wxUSE_MACOSX_SDK=$wxUSE_MACOSX_SDK" >> ${wx_arg_cache_file}.tmp + +else + + # NOTE: Empty string on purpose so that --without-macosx-sdk (thus no) + # will override --enable-universal_binary's automatic SDK usage. + wxUSE_MACOSX_SDK= + LINE=`grep "^wxUSE_MACOSX_SDK=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "$LINE" + echo "$LINE" >> ${wx_arg_cache_file}.tmp + fi + +fi + +{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_SDK" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_SDK" >&6; } + +{ echo "$as_me:$LINENO: checking for --with-macosx-version-min" >&5 +echo $ECHO_N "checking for --with-macosx-version-min... $ECHO_C" >&6; } + +# Check whether --with-macosx-version-min was given. +if test "${with_macosx_version_min+set}" = set; then + withval=$with_macosx_version_min; + wxUSE_MACOSX_VERSION_MIN=$withval + wx_cv_use_macosx_version_min="wxUSE_MACOSX_VERSION_MIN=$withval" + echo "wxUSE_MACOSX_VERSION_MIN=$wxUSE_MACOSX_VERSION_MIN" >> ${wx_arg_cache_file}.tmp + +else + + # default "yes" because when not using an SDK it means the same as no + # but when using an SDK it means to use the SDK version + wxUSE_MACOSX_VERSION_MIN=yes + # See if there is a value in the cache + LINE=`grep "^wxUSE_MACOSX_VERSION_MIN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "$LINE" + echo "$LINE" >> ${wx_arg_cache_file}.tmp + fi + +fi + +{ echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } + enablestring=disable @@ -4403,7 +4534,10 @@ else LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" @@ -4456,7 +4590,10 @@ else LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" @@ -4509,7 +4646,10 @@ else LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" @@ -4562,7 +4702,10 @@ else LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" @@ -4615,7 +4758,10 @@ else LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" @@ -4668,7 +4814,10 @@ else LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" @@ -4721,7 +4870,10 @@ else LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" @@ -4774,7 +4926,10 @@ else LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" @@ -4815,6 +4970,9 @@ 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 @@ -4857,7 +5015,10 @@ else LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" @@ -4910,7 +5071,10 @@ else LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" @@ -4965,7 +5129,10 @@ else LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" @@ -5030,7 +5197,10 @@ else LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" @@ -5083,7 +5253,10 @@ else LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" @@ -5136,7 +5309,10 @@ else LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" @@ -5189,7 +5365,10 @@ else LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" @@ -5242,7 +5421,10 @@ else LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" @@ -5295,7 +5477,10 @@ else LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" @@ -5348,7 +5533,10 @@ else LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" @@ -5401,7 +5589,10 @@ else LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" @@ -5454,7 +5645,10 @@ else LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" @@ -5507,7 +5701,10 @@ else LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" @@ -5560,7 +5757,10 @@ else LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" @@ -5601,6 +5801,9 @@ 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 @@ -5644,7 +5847,10 @@ else LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" @@ -5697,7 +5903,10 @@ else LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" @@ -5751,7 +5960,10 @@ else LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" @@ -5805,7 +6017,10 @@ else LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" @@ -5859,7 +6074,10 @@ else LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" @@ -5914,7 +6132,10 @@ else LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" @@ -5967,7 +6188,10 @@ else LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" @@ -6021,7 +6245,10 @@ else LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" @@ -6074,7 +6301,10 @@ else LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" @@ -6127,7 +6357,10 @@ else LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" @@ -6180,7 +6413,10 @@ else LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" @@ -6233,7 +6469,10 @@ else LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" @@ -6286,7 +6525,10 @@ else LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" @@ -6339,7 +6581,10 @@ else LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" @@ -6393,7 +6638,10 @@ else LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" @@ -6447,7 +6695,10 @@ else LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" @@ -6500,7 +6751,10 @@ else LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" @@ -6553,7 +6807,10 @@ else LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" @@ -6607,7 +6864,10 @@ else LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" @@ -6660,7 +6920,10 @@ else LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" @@ -6713,7 +6976,10 @@ else LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" @@ -6766,7 +7032,10 @@ else LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" @@ -6819,7 +7088,10 @@ else LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" @@ -6872,7 +7144,10 @@ else LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" @@ -6925,7 +7200,10 @@ else LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" @@ -6978,7 +7256,10 @@ else LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" @@ -7031,7 +7312,10 @@ else LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" @@ -7084,7 +7368,10 @@ else LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" @@ -7137,7 +7424,10 @@ else LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" @@ -7190,7 +7480,10 @@ else LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" @@ -7243,7 +7536,10 @@ else LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" @@ -7296,7 +7592,10 @@ else LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" @@ -7349,7 +7648,10 @@ else LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" @@ -7402,7 +7704,10 @@ else LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" @@ -7455,7 +7760,10 @@ else LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" @@ -7508,7 +7816,10 @@ else LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" @@ -7561,7 +7872,10 @@ else LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" @@ -7614,7 +7928,10 @@ else LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" @@ -7667,7 +7984,10 @@ else LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" @@ -7720,7 +8040,10 @@ else LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" @@ -7773,7 +8096,10 @@ else LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" @@ -7826,7 +8152,10 @@ else LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" @@ -7879,7 +8208,10 @@ else LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" @@ -7932,7 +8264,10 @@ else LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" @@ -7985,7 +8320,10 @@ else LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" @@ -8038,7 +8376,10 @@ else LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" @@ -8091,7 +8432,10 @@ else LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" @@ -8144,7 +8488,10 @@ else LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" @@ -8197,7 +8544,10 @@ else LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" @@ -8250,7 +8600,10 @@ else LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" @@ -8303,7 +8656,10 @@ else LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" @@ -8356,7 +8712,10 @@ else LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" @@ -8409,7 +8768,10 @@ else LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" @@ -8462,7 +8824,10 @@ else LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" @@ -8515,7 +8880,10 @@ else LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" @@ -8568,7 +8936,10 @@ else LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" @@ -8622,7 +8993,10 @@ else LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" @@ -8675,7 +9049,10 @@ else LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" @@ -8728,7 +9105,10 @@ else LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" @@ -8781,7 +9161,10 @@ else LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" @@ -8834,7 +9217,10 @@ else LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" @@ -8887,7 +9273,10 @@ else LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" @@ -8941,7 +9330,10 @@ else LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" @@ -8998,7 +9390,10 @@ else LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" @@ -9051,7 +9446,10 @@ else LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" @@ -9104,7 +9502,10 @@ else LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" @@ -9157,7 +9558,10 @@ else LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" @@ -9210,7 +9614,10 @@ else LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" @@ -9263,7 +9670,10 @@ else LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" @@ -9316,7 +9726,10 @@ else LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" @@ -9369,7 +9782,10 @@ else LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" @@ -9422,7 +9838,10 @@ else LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" @@ -9475,7 +9894,10 @@ else LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" @@ -9528,7 +9950,10 @@ else LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" @@ -9581,7 +10006,10 @@ else LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" @@ -9634,7 +10062,10 @@ else LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" @@ -9687,7 +10118,10 @@ else LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" @@ -9740,7 +10174,10 @@ else LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" @@ -9793,7 +10230,10 @@ else LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" @@ -9846,7 +10286,10 @@ else LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" @@ -9899,7 +10342,10 @@ else LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" @@ -9952,7 +10398,10 @@ else LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" @@ -10005,7 +10454,10 @@ else LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" @@ -10060,7 +10512,10 @@ else LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" @@ -10113,7 +10568,10 @@ else LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" @@ -10166,7 +10624,10 @@ else LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" @@ -10222,7 +10683,10 @@ else LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" @@ -10384,7 +10848,10 @@ else LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" @@ -10437,7 +10904,10 @@ else LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" @@ -10490,7 +10960,10 @@ else LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" @@ -10543,7 +11016,10 @@ else LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" @@ -10596,7 +11072,10 @@ else LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" @@ -10649,7 +11128,10 @@ else LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" @@ -10702,7 +11184,10 @@ else LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" @@ -10755,7 +11240,10 @@ else LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" @@ -10808,7 +11296,10 @@ else LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" @@ -10861,7 +11352,10 @@ else LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" @@ -10914,7 +11408,10 @@ else LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" @@ -10967,7 +11464,10 @@ else LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" @@ -11020,7 +11520,10 @@ else LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" @@ -11073,7 +11576,10 @@ else LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" @@ -11126,7 +11632,10 @@ else LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" @@ -11179,7 +11688,10 @@ else LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" @@ -11232,7 +11744,10 @@ else LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" @@ -11285,7 +11800,10 @@ else LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" @@ -11338,7 +11856,10 @@ else LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" @@ -11391,7 +11912,10 @@ else LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" @@ -11444,7 +11968,10 @@ else LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" @@ -11497,7 +12024,10 @@ else LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" @@ -11550,7 +12080,10 @@ else LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" @@ -11603,7 +12136,10 @@ else LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" @@ -11656,7 +12192,10 @@ else LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" @@ -11709,7 +12248,10 @@ else LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" @@ -11762,7 +12304,10 @@ else LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" @@ -11815,7 +12360,10 @@ else LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" @@ -11868,7 +12416,10 @@ else LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" @@ -11921,7 +12472,10 @@ else LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" @@ -11974,7 +12528,10 @@ else LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" @@ -12027,7 +12584,10 @@ else LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" @@ -12080,7 +12640,10 @@ else LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" @@ -12133,7 +12696,10 @@ else LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" @@ -12186,7 +12752,10 @@ else LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" @@ -12239,7 +12808,10 @@ else LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" @@ -12292,7 +12864,10 @@ else LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" @@ -12345,7 +12920,10 @@ else LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" @@ -12398,7 +12976,10 @@ else LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" @@ -12451,7 +13032,10 @@ else LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" @@ -12504,7 +13088,10 @@ else LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" @@ -12557,7 +13144,10 @@ else LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" @@ -12610,7 +13200,10 @@ else LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" @@ -12663,7 +13256,10 @@ else LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" @@ -12716,7 +13312,10 @@ else LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" @@ -12769,7 +13368,10 @@ else LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" @@ -12822,7 +13424,10 @@ else LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" @@ -12875,7 +13480,10 @@ else LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" @@ -12928,7 +13536,10 @@ else LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" @@ -12981,7 +13592,10 @@ else LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" @@ -13034,7 +13648,10 @@ else LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" @@ -13087,7 +13704,10 @@ else LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" @@ -13140,7 +13760,10 @@ else LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" @@ -13193,7 +13816,10 @@ else LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" @@ -13246,7 +13872,10 @@ else LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" @@ -13299,7 +13928,10 @@ else LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" @@ -13352,7 +13984,10 @@ else LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" @@ -13407,7 +14042,10 @@ else LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" @@ -13460,7 +14098,10 @@ else LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" @@ -13513,7 +14154,10 @@ else LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" @@ -13566,7 +14210,10 @@ else LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" @@ -13619,7 +14266,10 @@ else LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" @@ -13672,7 +14322,10 @@ else LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" @@ -13725,7 +14378,10 @@ else LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" @@ -13778,7 +14434,10 @@ else LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" @@ -13831,7 +14490,10 @@ else LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" @@ -13884,7 +14546,10 @@ else LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" @@ -13937,7 +14602,10 @@ else LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" @@ -13990,7 +14658,10 @@ else LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" @@ -14043,7 +14714,10 @@ else LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" @@ -14096,7 +14770,10 @@ else LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" @@ -14149,7 +14826,10 @@ else LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" @@ -14204,7 +14884,10 @@ else LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" @@ -14257,7 +14940,10 @@ else LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" @@ -14310,7 +14996,10 @@ else LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" @@ -14363,7 +15052,10 @@ else LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" @@ -14416,7 +15108,10 @@ else LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" @@ -14469,7 +15164,10 @@ else LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" @@ -14522,7 +15220,10 @@ else LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" @@ -14575,7 +15276,10 @@ else LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" @@ -14628,7 +15332,10 @@ else LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" @@ -14681,7 +15388,10 @@ else LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" @@ -14734,7 +15444,10 @@ else LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" @@ -14789,7 +15502,10 @@ else LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" @@ -14842,7 +15558,10 @@ else LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" @@ -14895,7 +15614,10 @@ else LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" @@ -14948,7 +15670,10 @@ else LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" @@ -15001,7 +15726,10 @@ else LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" @@ -15054,7 +15782,10 @@ else LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" @@ -15107,7 +15838,10 @@ else LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" @@ -15160,7 +15894,10 @@ else LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" @@ -15213,7 +15950,10 @@ else LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" @@ -15268,7 +16008,10 @@ else LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" @@ -15295,6 +16038,62 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iniconf" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-iniconf... $ECHO_C" >&6; } + # Check whether --enable-iniconf was given. +if test "${enable_iniconf+set}" = set; then + enableval=$enable_iniconf; + if test "$enableval" = yes; then + wx_cv_use_iniconf='wxUSE_INICONF=yes' + else + wx_cv_use_iniconf='wxUSE_INICONF=no' + fi + cache=yes + +else + + 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 + result=no + else + result=yes + fi + else + result=$wxUSE_INICONF + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -15321,7 +16120,10 @@ else LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + 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}" @@ -15348,6 +16150,62 @@ 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}-ownerdrawn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; } + # Check whether --enable-ownerdrawn was given. +if test "${enable_ownerdrawn+set}" = set; then + enableval=$enable_ownerdrawn; + if test "$enableval" = yes; then + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' + else + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" + +fi + + + eval "$wx_cv_use_ownerdrawn" + if test "x$cache" = xyes; then + echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OWNER_DRAWN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OWNER_DRAWN + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -15374,7 +16232,10 @@ else LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" @@ -15427,7 +16288,10 @@ else LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" @@ -15480,7 +16344,10 @@ else LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes + else + cache=no fi wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" @@ -19614,6 +20481,239 @@ case ${INSTALL} in INSTALL=`pwd`/${INSTALL} ;; esac +retest_macosx_linking=no + +#if test "$wxUSE_MAC" = 1; then + if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then + if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then + # Implicitly turn on the new --with-macosx-sdk using the default + # SDK which provides the behavior this option has always had. + if test "x$wxUSE_MACOSX_SDK" = "x"; then + { echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5 +echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;} + { echo "$as_me:$LINENO: WARNING: If you don't want this, specify --without-macosx-sdk" >&5 +echo "$as_me: WARNING: If you don't want this, specify --without-macosx-sdk" >&2;} + wxUSE_MACOSX_SDK=yes + fi + else + # Complain to user if he specified an argument to --enable-universal_binary + # and also 1) specified --with-macosx-sdk using the default (yes) or + # 2) specified --with-macosx-sdk using a path or 3) specified + # --without-macosx-sdk (no). + if test "x$wxUSE_MACOSX_SDK" != "x" ; then + { { echo "$as_me:$LINENO: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary +See \`config.log' for more details." >&5 +echo "$as_me: error: Please specify the new --with-macosx-sdk=PATH and do not specify an arg to --enable-universal_binary +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + # Put the SDK path into the wxUSE_MACOSX_SDK. We don't have to + # special-case the empty string because the below test simply + # converts "no" to the empty string anyway. + wxUSE_MACOSX_SDK="$wxUSE_UNIVERSAL_BINARY" + { echo "$as_me:$LINENO: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&5 +echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;} + fi + fi + OSX_UNIV_OPTS="-arch ppc -arch i386" + CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" + CFLAGS="$OSX_UNIV_OPTS $CFLAGS" + LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" + retest_macosx_linking=yes + + { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5 +echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} + bk_use_pch=no + fi +#fi + +if test "x$wxUSE_MACOSX_SDK" = "xno"; then + wxUSE_MACOSX_SDK= +elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then + # TODO: Search for most recent SDK and use it. + wxUSE_MACOSX_SDK="/Developer/SDKs/MacOSX10.4u.sdk" +fi + + +if test "x$wxUSE_MACOSX_SDK" != "x"; then + { echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 +echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6; } + if ! test -d "$wxUSE_MACOSX_SDK"; then + { { echo "$as_me:$LINENO: error: not found +See \`config.log' for more details." >&5 +echo "$as_me: error: not found +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: result: exists" >&5 +echo "${ECHO_T}exists" >&6; } + fi + MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" + retest_macosx_linking=yes + fi + +if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then + wxUSE_MACOSX_VERSION_MIN= +elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then + if test "x$wxUSE_MACOSX_SDK" != "x"; then + { echo "$as_me:$LINENO: checking SDK deployment version" >&5 +echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; } + + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" buildSettings | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` + + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" != "x"; then + wxUSE_MACOSX_VERSION_MIN=$MACOSX_SDK_PLIST_VERSION_MIN + { echo "$as_me:$LINENO: result: $wxUSE_MACOSX_VERSION_MIN" >&5 +echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } + else + { echo "$as_me:$LINENO: WARNING: Could not determine deployment target from SDKSettings.plist" >&5 +echo "$as_me: WARNING: Could not determine deployment target from SDKSettings.plist" >&2;} + wxUSE_MACOSX_VERSION_MIN= + fi + else + wxUSE_MACOSX_VERSION_MIN= + fi +fi + +if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then + MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" + eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" + eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" + retest_macosx_linking=yes +fi + +if test "x$retest_macosx_linking" = "xyes"; then + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + { echo "$as_me:$LINENO: checking if C compiler works with SDK/version options" >&5 +echo $ECHO_N "checking if C compiler works with SDK/version options... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: no. Try a different SDK +See \`config.log' for more details." >&5 +echo "$as_me: error: no. Try a different SDK +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; exit 1 +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + { echo "$as_me:$LINENO: checking if C++ compiler works with SDK/version options" >&5 +echo $ECHO_N "checking if C++ compiler works with SDK/version options... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: no. Try a different SDK +See \`config.log' for more details." >&5 +echo "$as_me: error: no. Try a different SDK +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; exit 1 +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +fi + case "${host}" in @@ -28618,8 +29718,6 @@ echo "$as_me: WARNING: system png library not found or too old, will use built-i fi fi fi - - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi @@ -33755,12 +34853,6 @@ done fi if test "$wxUSE_MOTIF" = 1; then - if test "$wxUSE_UNICODE" = "yes"; then - { { echo "$as_me:$LINENO: error: Unicode configuration not supported with Motif" >&5 -echo "$as_me: error: Unicode configuration not supported with Motif" >&2;} - { (exit 1); exit 1; }; } - fi - { echo "$as_me:$LINENO: checking for Motif/Lesstif headers" >&5 echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; } @@ -35392,25 +36484,19 @@ fi echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6; } if test $ac_cv_header_GL_gl_h = yes; then - if test "${ac_cv_header_GL_glu_h+set}" = set; then - { echo "$as_me:$LINENO: checking for GL/glu.h" >&5 + { echo "$as_me:$LINENO: checking for GL/glu.h" >&5 echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; } if test "${ac_cv_header_GL_glu_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 -echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking GL/glu.h usability" >&5 -echo $ECHO_N "checking GL/glu.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default + + #include _ACEOF rm -f conftest.$ac_objext @@ -35430,98 +36516,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + ac_cv_header_GL_glu_h=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + ac_cv_header_GL_glu_h=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking GL/glu.h presence" >&5 -echo $ECHO_N "checking GL/glu.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: GL/glu.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: GL/glu.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: GL/glu.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: GL/glu.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: GL/glu.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: GL/glu.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: GL/glu.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: GL/glu.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: GL/glu.h: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for GL/glu.h" >&5 -echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6; } -if test "${ac_cv_header_GL_glu_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_GL_glu_h=$ac_header_preproc fi { echo "$as_me:$LINENO: result: $ac_cv_header_GL_glu_h" >&5 echo "${ECHO_T}$ac_cv_header_GL_glu_h" >&6; } - -fi if test $ac_cv_header_GL_glu_h = yes; then found_gl=0 @@ -35871,6 +36877,86 @@ echo "${ECHO_T}$wx_cv_cc_visibility" >&6; } #define HAVE_VISIBILITY 1 _ACEOF + + { echo "$as_me:$LINENO: checking for broken libstdc++ visibility" >&5 +echo $ECHO_N "checking for broken libstdc++ visibility... $ECHO_C" >&6; } + if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + wx_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + std::string x; + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + wx_cv_cc_broken_libstdcxx_visibility=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_broken_libstdcxx_visibility=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CXXFLAGS="$wx_save_CXXFLAGS" +fi + + { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 +echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; } + if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1 +_ACEOF + + fi + else CFLAGS_VISIBILITY="" CXXFLAGS_VISIBILITY="" @@ -36350,8 +37436,8 @@ fi RESCOMP="$REZ" WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" else - POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" - RESCOMP="echo -n \| $REZ" + POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" + RESCOMP="cat /dev/null \| $REZ" WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" fi @@ -45521,26 +46607,19 @@ _ACEOF for ac_header in sys/epoll.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default + #include <$ac_header> _ACEOF rm -f conftest.$ac_objext @@ -45560,99 +46639,19 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_header_compiler=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_compiler=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( cat <<\_ASBOX -## ----------------------------------------- ## -## Report this to wx-dev@lists.wxwidgets.org ## -## ----------------------------------------- ## -_ASBOX - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" fi ac_res=`eval echo '${'$as_ac_Header'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 @@ -47358,13 +48357,6 @@ _ACEOF fi fi -if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_EXPERIMENTAL_PRINTF 1 -_ACEOF - -fi - if test "$wxUSE_CONSTRAINTS" = "yes"; then cat >>confdefs.h <<\_ACEOF @@ -47455,11 +48447,6 @@ cat >>confdefs.h <<\_ACEOF _ACEOF -cat >>confdefs.h <<\_ACEOF -#define wxUSE_NORMALIZED_PS_FONTS 1 -_ACEOF - - if test "$wxUSE_SVG" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SVG 1 @@ -47828,7 +48815,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then @@ -47881,7 +48867,7 @@ echo "$as_me: WARNING: wxDisplay not yet supported under $TOOLKIT... disabled" > #define wxUSE_DISPLAY 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon" + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display" fi fi @@ -47955,7 +48941,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -47999,7 +48984,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" fi - if test "$wxUSE_RADIOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_RADIOBOX 1 @@ -48454,7 +49438,6 @@ if test "$wxUSE_MINIFRAME" = "yes"; then #define wxUSE_MINIFRAME 1 _ACEOF - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then @@ -48691,6 +49674,13 @@ _ACEOF fi +if test "$wxUSE_INICONF" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_INICONF 1 +_ACEOF + +fi + if test "$wxUSE_DIB" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_WXDIB 1 @@ -48698,6 +49688,13 @@ _ACEOF fi +if test "$wxUSE_OWNER_DRAWN" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNER_DRAWN 1 +_ACEOF + +fi + if test "$wxUSE_REGKEY" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_REGKEY 1 @@ -49129,9 +50126,9 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - dynamic erase event exec font image minimal mobile \ - mobile/wxedit mobile/styles propsize render \ - rotate shaped svg taborder vscroll widgets" + erase event exec font image minimal mobile \ + mobile/wxedit mobile/styles render \ + shaped svg taborder vscroll widgets" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -49359,23 +50356,6 @@ if test "$wxUSE_WINE" = "yes"; then BAKEFILE_FORCE_PLATFORM=win32 fi -if test "$wxUSE_MAC" = 1 ; then - if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then - if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then - OSX_UNIV_OPTS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk" - else - OSX_UNIV_OPTS=${wxUSE_UNIVERSAL_BINARY:+"-isysroot '$wxUSE_UNIVERSAL_BINARY'"} - fi - OSX_UNIV_OPTS="$OSX_UNIV_OPTS -arch ppc -arch i386" - CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" - CFLAGS="$OSX_UNIV_OPTS $CFLAGS" - LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" - bk_use_pch=no - fi - # TODO: where do we add "-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" for libtool (static builds only)? - # The makefile currently uses AR and RANLIB, which libtool apparently supercedes. -fi - if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no then { echo "$as_me:$LINENO: checking for gcc precompiled header bug" >&5 @@ -54697,7 +55677,7 @@ echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITH echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}" echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" -echo -n " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}" +echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C" if test "$wxUSE_UNICODE" = "yes"; then if test "$wxUSE_UNICODE_UTF8" = "yes"; then echo " (using UTF-8)" @@ -54713,6 +55693,7 @@ echo " wxWidgets 2.6 ${WXWIN_COMPATIB echo " wxWidgets 2.8 ${WXWIN_COMPATIBILITY_2_8:-yes}" echo " Which libraries should wxWidgets use?" +echo " STL ${wxUSE_STL}" echo " jpeg ${wxUSE_LIBJPEG-none}" echo " png ${wxUSE_LIBPNG-none}" echo " regex ${wxUSE_REGEX}"