X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/508d12b2242e0d96c6fb5dc7d9c3ea2aac553603..b4e05bddd758d4097d7faae44d3327f4457f4418:/configure diff --git a/configure b/configure index c322b4e0f4..9403903cb3 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47611 2007-07-21 07:31:28Z VZ . +# From configure.in Id: configure.in 47734 2007-07-26 16:27:29Z 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,8 +1847,11 @@ 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-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 compile wxDIB class (Win32 only) + --enable-wxdib use wxDIB class (Win32 only) --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program @@ -1892,6 +1895,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 @@ -2939,6 +2944,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 @@ -2988,6 +2995,7 @@ if test "${enable_gui+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3041,6 +3049,7 @@ if test "${enable_monolithic+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3094,6 +3103,7 @@ if test "${enable_plugins+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3147,6 +3157,7 @@ if test "${with_subdirs+set}" = set; then else + cache=no LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3158,7 +3169,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 @@ -3206,6 +3217,7 @@ if test "${enable_official_build+set}" = set; then else + cache=no LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3268,6 +3280,7 @@ if test "${enable_all_features+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3325,6 +3338,7 @@ if test "${enable_universal+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3453,6 +3467,7 @@ if test "${enable_nanox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3512,6 +3527,7 @@ if test "${enable_gpe+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3566,6 +3582,7 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or else + cache=no LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3623,6 +3640,7 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o else + cache=no LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3680,6 +3698,7 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o else + cache=no LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3737,6 +3756,7 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or else + cache=no LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3795,6 +3815,7 @@ if test "${with_libmspack+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3806,7 +3827,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 @@ -3848,6 +3869,7 @@ if test "${with_gnomeprint+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3859,7 +3881,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 @@ -3901,6 +3923,7 @@ if test "${with_gnomevfs+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3912,7 +3935,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 @@ -3954,6 +3977,7 @@ if test "${with_hildon+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -3965,7 +3989,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 @@ -4007,6 +4031,7 @@ if test "${with_opengl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4018,7 +4043,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 @@ -4063,6 +4088,7 @@ if test "${with_dmalloc+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4074,7 +4100,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 @@ -4116,6 +4142,7 @@ if test "${with_sdl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4127,7 +4154,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 @@ -4168,6 +4195,7 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or else + cache=no LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4225,6 +4253,7 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b else + cache=no LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4282,6 +4311,7 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b else + cache=no LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4339,6 +4369,7 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or else + cache=no LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4373,6 +4404,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 @@ -4399,6 +4483,7 @@ if test "${enable_shared+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4452,6 +4537,7 @@ if test "${enable_optimise+set}" = set; then else + cache=no LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4505,6 +4591,7 @@ if test "${enable_debug+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4558,6 +4645,7 @@ if test "${enable_stl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4611,6 +4699,7 @@ if test "${enable_std_iostreams+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4664,6 +4753,7 @@ if test "${enable_std_string+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4717,6 +4807,7 @@ if test "${enable_unicode+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4770,6 +4861,7 @@ if test "${enable_mslu+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4810,6 +4902,7 @@ if test "${enable_utf8+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4853,6 +4946,7 @@ if test "${enable_utf8only+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4906,6 +5000,7 @@ if test "${enable_extended_rtti+set}" = set; then else + cache=no LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -4961,6 +5056,7 @@ if test "${enable_omf+set}" = set; then else + cache=no LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5026,6 +5122,7 @@ if test "${enable_debug_flag+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5079,6 +5176,7 @@ if test "${enable_debug_info+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5132,6 +5230,7 @@ if test "${enable_debug_gdb+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5185,6 +5284,7 @@ if test "${enable_debug_cntxt+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5238,6 +5338,7 @@ if test "${enable_mem_tracing+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5291,6 +5392,7 @@ if test "${enable_profile+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5344,6 +5446,7 @@ if test "${enable_no_rtti+set}" = set; then else + cache=no LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5397,6 +5500,7 @@ if test "${enable_no_exceptions+set}" = set; then else + cache=no LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5450,6 +5554,7 @@ if test "${enable_permissive+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5503,6 +5608,7 @@ if test "${enable_no_deps+set}" = set; then else + cache=no LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5556,6 +5662,7 @@ if test "${enable_vararg_macros+set}" = set; then else + cache=no LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5596,6 +5703,7 @@ if test "${enable_universal_binary+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5640,6 +5748,7 @@ if test "${enable_compat26+set}" = set; then else + cache=no LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5693,6 +5802,7 @@ if test "${enable_compat28+set}" = set; then else + cache=no LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5747,6 +5857,7 @@ if test "${enable_rpath+set}" = set; then else + cache=no LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5801,6 +5912,7 @@ if test "${enable_objc_uniquifying+set}" = set; then else + cache=no LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5855,6 +5967,7 @@ if test "${enable_visibility+set}" = set; then else + cache=no LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5910,6 +6023,7 @@ if test "${enable_intl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -5963,6 +6077,7 @@ if test "${enable_config+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6017,6 +6132,7 @@ if test "${enable_protocols+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6070,6 +6186,7 @@ if test "${enable_ftp+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6123,6 +6240,7 @@ if test "${enable_http+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6176,6 +6294,7 @@ if test "${enable_fileproto+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6229,6 +6348,7 @@ if test "${enable_sockets+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6282,6 +6402,7 @@ if test "${enable_ole+set}" = set; then else + cache=no LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6335,6 +6456,7 @@ if test "${enable_dataobj+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6389,6 +6511,7 @@ if test "${enable_ipc+set}" = set; then else + cache=no LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6443,6 +6566,7 @@ if test "${enable_baseevtloop+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6496,6 +6620,7 @@ if test "${enable_epoolloop+set}" = set; then else + cache=no LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6549,6 +6674,7 @@ if test "${enable_selectloop+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6603,6 +6729,7 @@ if test "${enable_apple_ieee+set}" = set; then else + cache=no LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6656,6 +6783,7 @@ if test "${enable_arcstream+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6709,6 +6837,7 @@ if test "${enable_base64+set}" = set; then else + cache=no LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6762,6 +6891,7 @@ if test "${enable_backtrace+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6815,6 +6945,7 @@ if test "${enable_catch_segvs+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6868,6 +6999,7 @@ if test "${enable_cmdline+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6921,6 +7053,7 @@ if test "${enable_datetime+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -6974,6 +7107,7 @@ if test "${enable_debugreport+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7027,6 +7161,7 @@ if test "${enable_dialupman+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7080,6 +7215,7 @@ if test "${enable_dynlib+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7133,6 +7269,7 @@ if test "${enable_dynamicloader+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7186,6 +7323,7 @@ if test "${enable_exceptions+set}" = set; then else + cache=no LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7239,6 +7377,7 @@ if test "${enable_ffile+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7292,6 +7431,7 @@ if test "${enable_file+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7345,6 +7485,7 @@ if test "${enable_filesystem+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7398,6 +7539,7 @@ if test "${enable_fontenum+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7451,6 +7593,7 @@ if test "${enable_fontmap+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7504,6 +7647,7 @@ if test "${enable_fs_archive+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7557,6 +7701,7 @@ if test "${enable_fs_inet+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7610,6 +7755,7 @@ if test "${enable_fs_zip+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7663,6 +7809,7 @@ if test "${enable_geometry+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7716,6 +7863,7 @@ if test "${enable_log+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7769,6 +7917,7 @@ if test "${enable_longlong+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7822,6 +7971,7 @@ if test "${enable_mimetype+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7875,6 +8025,7 @@ if test "${enable_snglinst+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7928,6 +8079,7 @@ if test "${enable_stdpaths+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -7981,6 +8133,7 @@ if test "${enable_stopwatch+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8034,6 +8187,7 @@ if test "${enable_streams+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8087,6 +8241,7 @@ if test "${enable_system_options+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8140,6 +8295,7 @@ if test "${enable_tarstream+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8193,6 +8349,7 @@ if test "${enable_textbuf+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8246,6 +8403,7 @@ if test "${enable_textfile+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8299,6 +8457,7 @@ if test "${enable_timer+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8352,6 +8511,7 @@ if test "${enable_sound+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8405,6 +8565,7 @@ if test "${enable_mediactrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8458,6 +8619,7 @@ if test "${enable_gstreamer8+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8511,6 +8673,7 @@ if test "${enable_printfposparam+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8564,6 +8727,7 @@ if test "${enable_zipstream+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8618,6 +8782,7 @@ if test "${enable_url+set}" = set; then else + cache=no LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8671,6 +8836,7 @@ if test "${enable_variant+set}" = set; then else + cache=no LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8724,6 +8890,7 @@ if test "${enable_protocol+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8777,6 +8944,7 @@ if test "${enable_protocol_http+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8830,6 +8998,7 @@ if test "${enable_protocol_ftp+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8883,6 +9052,7 @@ if test "${enable_protocol_file+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8937,6 +9107,7 @@ if test "${enable_threads+set}" = set; then else + cache=no LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -8994,6 +9165,7 @@ if test "${enable_docview+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9047,6 +9219,7 @@ if test "${enable_help+set}" = set; then else + cache=no LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9100,6 +9273,7 @@ if test "${enable_mshtmlhelp+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9153,6 +9327,7 @@ if test "${enable_html+set}" = set; then else + cache=no LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9206,6 +9381,7 @@ if test "${enable_htmlhelp+set}" = set; then else + cache=no LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9259,6 +9435,7 @@ if test "${enable_xrc+set}" = set; then else + cache=no LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9312,6 +9489,7 @@ if test "${enable_aui+set}" = set; then else + cache=no LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9365,6 +9543,7 @@ if test "${enable_stc+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9418,6 +9597,7 @@ if test "${enable_constraints+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9471,6 +9651,7 @@ if test "${enable_printarch+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9524,6 +9705,7 @@ if test "${enable_mdi+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9577,6 +9759,7 @@ if test "${enable_mdidoc+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9630,6 +9813,7 @@ if test "${enable_loggui+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9683,6 +9867,7 @@ if test "${enable_logwin+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9736,6 +9921,7 @@ if test "${enable_logdialog+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9789,6 +9975,7 @@ if test "${enable_webkit+set}" = set; then else + cache=no LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9842,6 +10029,7 @@ if test "${enable_richtext+set}" = set; then else + cache=no LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9895,6 +10083,7 @@ if test "${enable_graphics_ctx+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -9948,6 +10137,7 @@ if test "${enable_postscript+set}" = set; then else + cache=no LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10001,6 +10191,7 @@ if test "${enable_svg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10056,6 +10247,7 @@ if test "${enable_clipboard+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10109,6 +10301,7 @@ if test "${enable_dnd+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10162,6 +10355,7 @@ if test "${enable_metafile+set}" = set; then else + cache=no LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10218,6 +10412,7 @@ if test "${enable_controls+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10380,6 +10575,7 @@ if test "${enable_accel+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10433,6 +10629,7 @@ if test "${enable_animatectrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10486,6 +10683,7 @@ if test "${enable_button+set}" = set; then else + cache=no LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10539,6 +10737,7 @@ if test "${enable_bmpbutton+set}" = set; then else + cache=no LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10592,6 +10791,7 @@ if test "${enable_bmpcombobox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10645,6 +10845,7 @@ if test "${enable_calendar+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10698,6 +10899,7 @@ if test "${enable_caret+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10751,6 +10953,7 @@ if test "${enable_checkbox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10804,6 +11007,7 @@ if test "${enable_checklst+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10857,6 +11061,7 @@ if test "${enable_choice+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10910,6 +11115,7 @@ if test "${enable_choicebook+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -10963,6 +11169,7 @@ if test "${enable_collpane+set}" = set; then else + cache=no LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11016,6 +11223,7 @@ if test "${enable_colourpicker+set}" = set; then else + cache=no LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11069,6 +11277,7 @@ if test "${enable_combobox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11122,6 +11331,7 @@ if test "${enable_comboctrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11175,6 +11385,7 @@ if test "${enable_datepick+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11228,6 +11439,7 @@ if test "${enable_dirpicker+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11281,6 +11493,7 @@ if test "${enable_display+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11334,6 +11547,7 @@ if test "${enable_detect_sm+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11387,6 +11601,7 @@ if test "${enable_editablebox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11440,6 +11655,7 @@ if test "${enable_filepicker+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11493,6 +11709,7 @@ if test "${enable_fontpicker+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11546,6 +11763,7 @@ if test "${enable_gauge+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11599,6 +11817,7 @@ if test "${enable_grid+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11652,6 +11871,7 @@ if test "${enable_dataviewctrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11705,6 +11925,7 @@ if test "${enable_hyperlink+set}" = set; then else + cache=no LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11758,6 +11979,7 @@ if test "${enable_imaglist+set}" = set; then else + cache=no LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11811,6 +12033,7 @@ if test "${enable_listbook+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11864,6 +12087,7 @@ if test "${enable_listbox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11917,6 +12141,7 @@ if test "${enable_listctrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -11970,6 +12195,7 @@ if test "${enable_notebook+set}" = set; then else + cache=no LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12023,6 +12249,7 @@ if test "${enable_odcombobox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12076,6 +12303,7 @@ if test "${enable_radiobox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12129,6 +12357,7 @@ if test "${enable_radiobtn+set}" = set; then else + cache=no LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12182,6 +12411,7 @@ if test "${enable_sash+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12235,6 +12465,7 @@ if test "${enable_scrollbar+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12288,6 +12519,7 @@ if test "${enable_searchctrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12341,6 +12573,7 @@ if test "${enable_slider+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12394,6 +12627,7 @@ if test "${enable_spinbtn+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12447,6 +12681,7 @@ if test "${enable_spinctrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12500,6 +12735,7 @@ if test "${enable_splitter+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12553,6 +12789,7 @@ if test "${enable_statbmp+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12606,6 +12843,7 @@ if test "${enable_statbox+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12659,6 +12897,7 @@ if test "${enable_statline+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12712,6 +12951,7 @@ if test "${enable_stattext+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12765,6 +13005,7 @@ if test "${enable_statusbar+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12818,6 +13059,7 @@ if test "${enable_tabdialog+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12871,6 +13113,7 @@ if test "${enable_taskbaricon+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12924,6 +13167,7 @@ if test "${enable_textctrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -12977,6 +13221,7 @@ if test "${enable_togglebtn+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13030,6 +13275,7 @@ if test "${enable_toolbar+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13083,6 +13329,7 @@ if test "${enable_tbarnative+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13136,6 +13383,7 @@ if test "${enable_treebook+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13189,6 +13437,7 @@ if test "${enable_toolbook+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13242,6 +13491,7 @@ if test "${enable_treectrl+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13295,6 +13545,7 @@ if test "${enable_tipwindow+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13348,6 +13599,7 @@ if test "${enable_popupwin+set}" = set; then else + cache=no LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13403,6 +13655,7 @@ if test "${enable_commondlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13456,6 +13709,7 @@ if test "${enable_aboutdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13509,6 +13763,7 @@ if test "${enable_choicedlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13562,6 +13817,7 @@ if test "${enable_coldlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13615,6 +13871,7 @@ if test "${enable_filedlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13668,6 +13925,7 @@ if test "${enable_finddlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13721,6 +13979,7 @@ if test "${enable_fontdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13774,6 +14033,7 @@ if test "${enable_dirdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13827,6 +14087,7 @@ if test "${enable_msgdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13880,6 +14141,7 @@ if test "${enable_numberdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13933,6 +14195,7 @@ if test "${enable_splash+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -13986,6 +14249,7 @@ if test "${enable_textdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14039,6 +14303,7 @@ if test "${enable_tipdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14092,6 +14357,7 @@ if test "${enable_progressdlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14145,6 +14411,7 @@ if test "${enable_wizarddlg+set}" = set; then else + cache=no LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14200,6 +14467,7 @@ if test "${enable_menus+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14253,6 +14521,7 @@ if test "${enable_miniframe+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14306,6 +14575,7 @@ if test "${enable_tooltips+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14359,6 +14629,7 @@ if test "${enable_splines+set}" = set; then else + cache=no LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14412,6 +14683,7 @@ if test "${enable_mousewheel+set}" = set; then else + cache=no LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14465,6 +14737,7 @@ if test "${enable_validators+set}" = set; then else + cache=no LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14518,6 +14791,7 @@ if test "${enable_busyinfo+set}" = set; then else + cache=no LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14571,6 +14845,7 @@ if test "${enable_joystick+set}" = set; then else + cache=no LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14624,6 +14899,7 @@ if test "${enable_metafile+set}" = set; then else + cache=no LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14677,6 +14953,7 @@ if test "${enable_dragimage+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14730,6 +15007,7 @@ if test "${enable_accessibility+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14785,6 +15063,7 @@ if test "${enable_palette+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14838,6 +15117,7 @@ if test "${enable_image+set}" = set; then else + cache=no LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14891,6 +15171,7 @@ if test "${enable_gif+set}" = set; then else + cache=no LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14944,6 +15225,7 @@ if test "${enable_pcx+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -14997,6 +15279,7 @@ if test "${enable_tga+set}" = set; then else + cache=no LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15050,6 +15333,7 @@ if test "${enable_iff+set}" = set; then else + cache=no LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15103,6 +15387,7 @@ if test "${enable_pnm+set}" = set; then else + cache=no LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15156,6 +15441,7 @@ if test "${enable_xpm+set}" = set; then else + cache=no LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15209,6 +15495,7 @@ if test "${enable_ico_cur+set}" = set; then else + cache=no LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15264,6 +15551,7 @@ if test "${enable_dccache+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15293,6 +15581,168 @@ 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}-ps-in-msw" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; } + # Check whether --enable-ps-in-msw was given. +if test "${enable_ps_in_msw+set}" = set; then + enableval=$enable_ps_in_msw; + if test "$enableval" = yes; then + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' + else + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' + fi + cache=yes + +else + + cache=no + LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + fi + + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" + +fi + + + eval "$wx_cv_use_ps_in_msw" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; } + # Check whether --enable-ownerdrawn was given. +if test "${enable_ownerdrawn+set}" = set; then + enableval=$enable_ownerdrawn; + if test "$enableval" = yes; then + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' + else + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' + fi + cache=yes + +else + + cache=no + LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + fi + + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" + +fi + + + eval "$wx_cv_use_ownerdrawn" + if test "x$cache" = xyes; then + echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OWNER_DRAWN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OWNER_DRAWN + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-regkey" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-regkey... $ECHO_C" >&6; } + # Check whether --enable-regkey was given. +if test "${enable_regkey+set}" = set; then + enableval=$enable_regkey; + if test "$enableval" = yes; then + wx_cv_use_regkey='wxUSE_REGKEY=yes' + else + wx_cv_use_regkey='wxUSE_REGKEY=no' + fi + cache=yes + +else + + cache=no + LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + fi + + wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" + +fi + + + eval "$wx_cv_use_regkey" + if test "x$cache" = xyes; then + echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_REGKEY = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_REGKEY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -15317,6 +15767,7 @@ if test "${enable_uxtheme+set}" = set; then else + cache=no LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -15370,6 +15821,7 @@ if test "${enable_wxdib+set}" = set; then else + cache=no LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" @@ -19506,6 +19958,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 @@ -33647,12 +34332,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; } @@ -35763,6 +36442,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="" @@ -48583,16 +49342,37 @@ _ACEOF fi -if test "$wxUSE_UXTHEME" = "yes"; then +if test "$wxUSE_DIB" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define wxUSE_UXTHEME 1 +#define wxUSE_WXDIB 1 _ACEOF fi -if test "$wxUSE_DIB" = "yes"; then +if test "$wxUSE_OWNER_DRAWN" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define wxUSE_WXDIB 1 +#define wxUSE_OWNER_DRAWN 1 +_ACEOF + +fi + +if test "$wxUSE_REGKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REGKEY 1 +_ACEOF + +fi + +if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +_ACEOF + +fi + +if test "$wxUSE_UXTHEME" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UXTHEME 1 _ACEOF fi @@ -49237,23 +50017,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