X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47124ca667df7b2728fe31f25ba501ecaae5cf5c..16a6b53ddc74d62fd1b6b82651d0e3859580c48a:/configure diff --git a/configure b/configure index 79a514aea8..ba33eb5b3b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47467 2007-07-14 19:17:21Z PC . +# From configure.in Id: configure.in 48648 2007-09-13 06:24:14Z PC . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -679,16 +679,7 @@ EGREP CXX CXXFLAGS ac_ct_CXX -RANLIB AR -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -STRIP -WINDRES -DLLTOOL -IF_GNU_MAKE -LN_S subdirs PKG_CONFIG GTK_CFLAGS @@ -709,13 +700,12 @@ PANGOXFT_CFLAGS PANGOXFT_LIBS CFLAGS_VISIBILITY CXXFLAGS_VISIBILITY -REZ -DEREZ -SETFILE LIBICONV SDL_CONFIG SDL_CFLAGS SDL_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS @@ -753,6 +743,7 @@ EXTRALIBS_GUI EXTRALIBS_OPENGL EXTRALIBS_SDL WITH_PLUGIN_SDL +EXTRALIBS_GTKPRINT EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON @@ -767,12 +758,19 @@ SAMPLES_RPATH_POSTLINK HOST_SUFFIX CPPUNIT_CFLAGS CPPUNIT_LIBS +RANLIB +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +LN_S SET_MAKE MAKE_SET AROPTIONS +STRIP NM INSTALL_DIR LDFLAGS_GUI +IF_GNU_MAKE PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS @@ -805,6 +803,9 @@ USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS +WINDRES +REZ +SETFILE GCC_PCH ICC_PCH BK_MAKE_PCH @@ -977,6 +978,7 @@ COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN +DEREZ SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI @@ -1018,6 +1020,7 @@ LIBWXMACRES POSTLINK_COMMAND MACSETFILE GCC +DLLTOOL CPPUNIT_CONFIG LIBOBJS LTLIBOBJS' @@ -1044,6 +1047,8 @@ PANGOFT2_CFLAGS PANGOFT2_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS +GTKPRINT_CFLAGS +GTKPRINT_LIBS LIBGNOMEPRINTUI_CFLAGS LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS @@ -1666,7 +1671,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 @@ -1682,9 +1687,9 @@ Optional Features: --enable-ole use OLE classes (Win32 only) --enable-dataobj use data object classes --enable-ipc use interprocess communication (wxSocket etc.) - --enable-base-evtloop use event loop in console programs too - --enable-epool-loop use wxEpollDispatcher class (Linux only) - --enable-select-loop use wxSelectDispatcher class + --enable-baseevtloop use event loop in console programs too + --enable-epollloop use wxEpollDispatcher class (Linux only) + --enable-selectloop use wxSelectDispatcher class --enable-apple_ieee use the Apple IEEE codec --enable-arcstream use wxArchive streams --enable-base64 use base64 encoding/decoding functions @@ -1700,6 +1705,7 @@ Optional Features: --enable-ffile use wxFFile class --enable-file use wxFile class --enable-filesystem use virtual file systems classes + --enable-fontenum use wxFontEnumerator class --enable-fontmap use font encodings conversion classes --enable-fs_archive use virtual archive filesystems --enable-fs_inet use virtual HTTP/FTP filesystems @@ -1729,6 +1735,8 @@ Optional Features: --enable-protocol-ftp FTP support in wxProtocol --enable-protocol-file FILE support in wxProtocol --enable-threads use threads + --enable-iniconf use wxIniConfig (Win32 only) + --enable-regkey use wxRegKey class (Win32 only) --enable-docview use document view architecture --enable-help use help subsystem --enable-mshtmlhelp use MS HTML Help (win32) @@ -1774,6 +1782,7 @@ Optional Features: --enable-detect_sm use code to detect X11 session manager --enable-editablebox use wxEditableListBox class --enable-filepicker use wxFilePickerCtrl class + --enable-filectrl use wxFileCtrl class --enable-fontpicker use wxFontPickerCtrl class --enable-gauge use wxGauge class --enable-grid use wxGrid class @@ -1800,6 +1809,7 @@ Optional Features: --enable-stattext use wxStaticText class --enable-statusbar use wxStatusBar class --enable-tabdialog use wxTabControl class + --enable-taskbaricon use wxTaskBarIcon class --enable-textctrl use wxTextCtrl class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class @@ -1835,7 +1845,6 @@ Optional Features: --enable-metafiles use wxMetaFile (Win32 only) --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support - --enable-dccache cache temporary wxDC objects (Win32 only) --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1845,6 +1854,11 @@ Optional Features: --enable-pnm use pnm images (PNM file format) --enable-xpm use xpm images (XPM file format) --enable-icocur use Windows ICO and CUR formats + --enable-dccache cache temporary wxDC objects (Win32 only) + --enable-ps-in-msw use PS printing in wxMSW (Win32 only) + --enable-ownerdrawn use owner drawn controls (Win32 only) + --enable-uxtheme enable support for Windows XP themed look (Win32 only) + --enable-wxdib use wxDIB class (Win32 only) --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program --disable-gtktest Do not try to compile and run a test GTK program @@ -1878,6 +1892,7 @@ Optional Packages: --with-libtiff use libtiff (TIFF file format) --with-libxpm use libxpm (XPM file format) --with-libmspack use libmspack (CHM help files loading) + --without-gtkprint don't use GTK printing support --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types --with-hildon use Hildon framework for Nokia 770 @@ -1888,6 +1903,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 @@ -1925,6 +1942,10 @@ Some influential environment variables: C compiler flags for PANGOXFT, overriding pkg-config PANGOXFT_LIBS linker flags for PANGOXFT, overriding pkg-config + GTKPRINT_CFLAGS + C compiler flags for GTKPRINT, overriding pkg-config + GTKPRINT_LIBS + linker flags for GTKPRINT, overriding pkg-config LIBGNOMEPRINTUI_CFLAGS C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config LIBGNOMEPRINTUI_LIBS @@ -2935,6 +2956,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 @@ -2972,7 +2995,6 @@ done { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gui... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gui was given. if test "${enable_gui+set}" = set; then enableval=$enable_gui; @@ -2981,14 +3003,16 @@ if test "${enable_gui+set}" = set; then else wx_cv_use_gui='wxUSE_GUI=no' fi + cache=yes else LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}" @@ -2997,8 +3021,8 @@ fi eval "$wx_cv_use_gui" - if test "$no_cache" != 1; then - echo $wx_cv_use_gui >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3027,7 +3051,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-monolithic" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-monolithic... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-monolithic was given. if test "${enable_monolithic+set}" = set; then enableval=$enable_monolithic; @@ -3036,14 +3059,16 @@ if test "${enable_monolithic+set}" = set; then else wx_cv_use_monolithic='wxUSE_MONOLITHIC=no' fi + cache=yes else LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}" @@ -3052,8 +3077,8 @@ fi eval "$wx_cv_use_monolithic" - if test "$no_cache" != 1; then - echo $wx_cv_use_monolithic >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3082,7 +3107,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-plugins" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-plugins... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-plugins was given. if test "${enable_plugins+set}" = set; then enableval=$enable_plugins; @@ -3091,14 +3115,16 @@ if test "${enable_plugins+set}" = set; then else wx_cv_use_plugins='wxUSE_PLUGINS=no' fi + cache=yes else LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}" @@ -3107,8 +3133,8 @@ fi eval "$wx_cv_use_plugins" - if test "$no_cache" != 1; then - echo $wx_cv_use_plugins >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3136,7 +3162,6 @@ echo "${ECHO_T}$result" >&6; } fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-subdirs" >&5 echo $ECHO_N "checking for --${withstring:-with}-subdirs... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-subdirs was given. if test "${with_subdirs+set}" = set; then @@ -3146,14 +3171,16 @@ if test "${with_subdirs+set}" = set; then else wx_cv_use_subdirs='wxWITH_SUBDIRS=no' fi + cache=yes else LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}" @@ -3162,8 +3189,8 @@ fi eval "$wx_cv_use_subdirs" - if test "$no_cache" != 1; then - echo $wx_cv_use_subdirs >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -3198,7 +3225,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-official_build" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-official_build... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-official_build was given. if test "${enable_official_build+set}" = set; then enableval=$enable_official_build; @@ -3207,14 +3233,16 @@ if test "${enable_official_build+set}" = set; then else wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no' fi + cache=yes else LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}" @@ -3223,8 +3251,8 @@ fi eval "$wx_cv_use_official_build" - if test "$no_cache" != 1; then - echo $wx_cv_use_official_build >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_OFFICIAL_BUILD=$wxUSE_OFFICIAL_BUILD" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3262,7 +3290,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-all-features" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-all-features... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-all-features was given. if test "${enable_all_features+set}" = set; then enableval=$enable_all_features; @@ -3271,14 +3298,16 @@ if test "${enable_all_features+set}" = set; then else wx_cv_use_all_features='wxUSE_ALL_FEATURES=no' fi + cache=yes else LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}" @@ -3287,8 +3316,8 @@ fi eval "$wx_cv_use_all_features" - if test "$no_cache" != 1; then - echo $wx_cv_use_all_features >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ALL_FEATURES=$wxUSE_ALL_FEATURES" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3321,7 +3350,6 @@ if test "$wxUSE_GUI" = "yes"; then { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-universal... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-universal was given. if test "${enable_universal+set}" = set; then enableval=$enable_universal; @@ -3330,14 +3358,16 @@ if test "${enable_universal+set}" = set; then else wx_cv_use_universal='wxUSE_UNIVERSAL=no' fi + cache=yes else LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}" @@ -3346,8 +3376,8 @@ fi eval "$wx_cv_use_universal" - if test "$no_cache" != 1; then - echo $wx_cv_use_universal >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3451,7 +3481,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-nanox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-nanox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-nanox was given. if test "${enable_nanox+set}" = set; then enableval=$enable_nanox; @@ -3460,14 +3489,16 @@ if test "${enable_nanox+set}" = set; then else wx_cv_use_nanox='wxUSE_NANOX=no' fi + cache=yes else LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}" @@ -3476,8 +3507,8 @@ fi eval "$wx_cv_use_nanox" - if test "$no_cache" != 1; then - echo $wx_cv_use_nanox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3512,7 +3543,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gpe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gpe... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gpe was given. if test "${enable_gpe+set}" = set; then enableval=$enable_gpe; @@ -3521,14 +3551,16 @@ if test "${enable_gpe+set}" = set; then else wx_cv_use_gpe='wxUSE_GPE=no' fi + cache=yes else LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}" @@ -3537,8 +3569,8 @@ fi eval "$wx_cv_use_gpe" - if test "$no_cache" != 1; then - echo $wx_cv_use_gpe >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -3559,7 +3591,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --with-libpng" >&5 echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libpng was given. if test "${with_libpng+set}" = set; then @@ -3577,14 +3608,16 @@ if test "${with_libpng+set}" = set; then echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}" @@ -3593,8 +3626,8 @@ fi eval "$wx_cv_use_libpng" - if test "$no_cache" != 1; then - echo $wx_cv_use_libpng >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBPNG" = yes; then @@ -3618,7 +3651,6 @@ echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or { echo "$as_me:$LINENO: checking for --with-libjpeg" >&5 echo $ECHO_N "checking for --with-libjpeg... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libjpeg was given. if test "${with_libjpeg+set}" = set; then @@ -3636,14 +3668,16 @@ if test "${with_libjpeg+set}" = set; then echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}" @@ -3652,8 +3686,8 @@ fi eval "$wx_cv_use_libjpeg" - if test "$no_cache" != 1; then - echo $wx_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBJPEG" = yes; then @@ -3677,7 +3711,6 @@ echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, o { echo "$as_me:$LINENO: checking for --with-libtiff" >&5 echo $ECHO_N "checking for --with-libtiff... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libtiff was given. if test "${with_libtiff+set}" = set; then @@ -3695,14 +3728,16 @@ if test "${with_libtiff+set}" = set; then echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}" @@ -3711,8 +3746,8 @@ fi eval "$wx_cv_use_libtiff" - if test "$no_cache" != 1; then - echo $wx_cv_use_libtiff >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBTIFF" = yes; then @@ -3736,7 +3771,6 @@ echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, o { echo "$as_me:$LINENO: checking for --with-libxpm" >&5 echo $ECHO_N "checking for --with-libxpm... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libxpm was given. if test "${with_libxpm+set}" = set; then @@ -3754,14 +3788,16 @@ if test "${with_libxpm+set}" = set; then echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}" @@ -3770,8 +3806,8 @@ fi eval "$wx_cv_use_libxpm" - if test "$no_cache" != 1; then - echo $wx_cv_use_libxpm >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_LIBXPM" = yes; then @@ -3804,7 +3840,6 @@ echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-libmspack" >&5 echo $ECHO_N "checking for --${withstring:-with}-libmspack... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-libmspack was given. if test "${with_libmspack+set}" = set; then @@ -3814,14 +3849,16 @@ if test "${with_libmspack+set}" = set; then else wx_cv_use_libmspack='wxUSE_LIBMSPACK=no' fi + cache=yes else LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}" @@ -3830,8 +3867,8 @@ fi eval "$wx_cv_use_libmspack" - if test "$no_cache" != 1; then - echo $wx_cv_use_libmspack >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -3848,6 +3885,62 @@ fi echo "${ECHO_T}$result" >&6; } + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { echo "$as_me:$LINENO: checking for --${withstring:-with}-gtkprint" >&5 +echo $ECHO_N "checking for --${withstring:-with}-gtkprint... $ECHO_C" >&6; } + +# Check whether --with-gtkprint was given. +if test "${with_gtkprint+set}" = set; then + withval=$with_gtkprint; + if test "$withval" = yes; then + wx_cv_use_gtkprint='wxUSE_GTKPRINT=yes' + else + wx_cv_use_gtkprint='wxUSE_GTKPRINT=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_GTKPRINT=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_gtkprint='wxUSE_GTKPRINT=${'DEFAULT_wxUSE_GTKPRINT":-$defaultval}" + +fi + + + eval "$wx_cv_use_gtkprint" + if test "x$cache" = xyes; then + echo "wxUSE_GTKPRINT=$wxUSE_GTKPRINT" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$withstring" = xwithout; then + if test $wxUSE_GTKPRINT = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_GTKPRINT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + withstring=without defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -3859,7 +3952,6 @@ echo "${ECHO_T}$result" >&6; } fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomeprint" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomeprint... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-gnomeprint was given. if test "${with_gnomeprint+set}" = set; then @@ -3869,14 +3961,16 @@ if test "${with_gnomeprint+set}" = set; then else wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' fi + cache=yes else LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" @@ -3885,8 +3979,8 @@ fi eval "$wx_cv_use_gnomeprint" - if test "$no_cache" != 1; then - echo $wx_cv_use_gnomeprint >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -3914,7 +4008,6 @@ echo "${ECHO_T}$result" >&6; } fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-gnomevfs" >&5 echo $ECHO_N "checking for --${withstring:-with}-gnomevfs... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-gnomevfs was given. if test "${with_gnomevfs+set}" = set; then @@ -3924,14 +4017,16 @@ if test "${with_gnomevfs+set}" = set; then else wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' fi + cache=yes else LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" @@ -3940,8 +4035,8 @@ fi eval "$wx_cv_use_gnomevfs" - if test "$no_cache" != 1; then - echo $wx_cv_use_gnomevfs >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -3969,7 +4064,6 @@ echo "${ECHO_T}$result" >&6; } fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-hildon" >&5 echo $ECHO_N "checking for --${withstring:-with}-hildon... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-hildon was given. if test "${with_hildon+set}" = set; then @@ -3979,14 +4073,16 @@ if test "${with_hildon+set}" = set; then else wx_cv_use_hildon='wxUSE_LIBHILDON=no' fi + cache=yes else LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}" @@ -3995,8 +4091,8 @@ fi eval "$wx_cv_use_hildon" - if test "$no_cache" != 1; then - echo $wx_cv_use_hildon >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -4024,7 +4120,6 @@ echo "${ECHO_T}$result" >&6; } fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-opengl" >&5 echo $ECHO_N "checking for --${withstring:-with}-opengl... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-opengl was given. if test "${with_opengl+set}" = set; then @@ -4034,14 +4129,16 @@ if test "${with_opengl+set}" = set; then else wx_cv_use_opengl='wxUSE_OPENGL=no' fi + cache=yes else LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}" @@ -4050,8 +4147,8 @@ fi eval "$wx_cv_use_opengl" - if test "$no_cache" != 1; then - echo $wx_cv_use_opengl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -4082,7 +4179,6 @@ fi fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-dmalloc" >&5 echo $ECHO_N "checking for --${withstring:-with}-dmalloc... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-dmalloc was given. if test "${with_dmalloc+set}" = set; then @@ -4092,14 +4188,16 @@ if test "${with_dmalloc+set}" = set; then else wx_cv_use_dmalloc='wxUSE_DMALLOC=no' fi + cache=yes else LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}" @@ -4108,8 +4206,8 @@ fi eval "$wx_cv_use_dmalloc" - if test "$no_cache" != 1; then - echo $wx_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -4137,7 +4235,6 @@ echo "${ECHO_T}$result" >&6; } fi { echo "$as_me:$LINENO: checking for --${withstring:-with}-sdl" >&5 echo $ECHO_N "checking for --${withstring:-with}-sdl... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-sdl was given. if test "${with_sdl+set}" = set; then @@ -4147,14 +4244,16 @@ if test "${with_sdl+set}" = set; then else wx_cv_use_sdl='wxUSE_LIBSDL=no' fi + cache=yes else LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}" @@ -4163,8 +4262,8 @@ fi eval "$wx_cv_use_sdl" - if test "$no_cache" != 1; then - echo $wx_cv_use_sdl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp fi if test x"$withstring" = xwithout; then @@ -4183,7 +4282,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --with-regex" >&5 echo $ECHO_N "checking for --with-regex... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-regex was given. if test "${with_regex+set}" = set; then @@ -4201,14 +4299,16 @@ if test "${with_regex+set}" = set; then echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}" @@ -4217,8 +4317,8 @@ fi eval "$wx_cv_use_regex" - if test "$no_cache" != 1; then - echo $wx_cv_use_regex >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_REGEX" = yes; then @@ -4242,7 +4342,6 @@ echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or { echo "$as_me:$LINENO: checking for --with-zlib" >&5 echo $ECHO_N "checking for --with-zlib... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-zlib was given. if test "${with_zlib+set}" = set; then @@ -4260,14 +4359,16 @@ if test "${with_zlib+set}" = set; then echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}" @@ -4276,8 +4377,8 @@ fi eval "$wx_cv_use_zlib" - if test "$no_cache" != 1; then - echo $wx_cv_use_zlib >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_ZLIB" = yes; then @@ -4301,7 +4402,6 @@ echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or b { echo "$as_me:$LINENO: checking for --with-odbc" >&5 echo $ECHO_N "checking for --with-odbc... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-odbc was given. if test "${with_odbc+set}" = set; then @@ -4319,14 +4419,16 @@ if test "${with_odbc+set}" = set; then echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_ODBC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_odbc='wxUSE_ODBC=${'DEFAULT_wxUSE_ODBC":-$wxUSE_ALL_FEATURES}" @@ -4335,8 +4437,8 @@ fi eval "$wx_cv_use_odbc" - if test "$no_cache" != 1; then - echo $wx_cv_use_odbc >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ODBC=$wxUSE_ODBC" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_ODBC" = yes; then @@ -4360,7 +4462,6 @@ echo "$as_me: error: Invalid value for --with-odbc: should be yes, no, sys, or b { echo "$as_me:$LINENO: checking for --with-expat" >&5 echo $ECHO_N "checking for --with-expat... $ECHO_C" >&6; } - no_cache=0 # Check whether --with-expat was given. if test "${with_expat+set}" = set; then @@ -4378,14 +4479,16 @@ if test "${with_expat+set}" = set; then echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;} { (exit 1); exit 1; }; } fi + cache=yes else LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}" @@ -4394,8 +4497,8 @@ fi eval "$wx_cv_use_expat" - if test "$no_cache" != 1; then - echo $wx_cv_use_expat >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp fi if test "$wxUSE_EXPAT" = yes; then @@ -4417,6 +4520,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 @@ -4431,7 +4587,6 @@ echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; @@ -4440,14 +4595,16 @@ if test "${enable_shared+set}" = set; then else wx_cv_use_shared='wxUSE_SHARED=no' fi + cache=yes else LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" @@ -4456,8 +4613,8 @@ fi eval "$wx_cv_use_shared" - if test "$no_cache" != 1; then - echo $wx_cv_use_shared >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4486,7 +4643,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-optimise was given. if test "${enable_optimise+set}" = set; then enableval=$enable_optimise; @@ -4495,14 +4651,16 @@ if test "${enable_optimise+set}" = set; then else wx_cv_use_optimise='wxUSE_OPTIMISE=no' fi + cache=yes else LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}" @@ -4511,8 +4669,8 @@ fi eval "$wx_cv_use_optimise" - if test "$no_cache" != 1; then - echo $wx_cv_use_optimise >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4541,7 +4699,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then enableval=$enable_debug; @@ -4550,14 +4707,16 @@ if test "${enable_debug+set}" = set; then else wx_cv_use_debug='wxUSE_DEBUG=no' fi + cache=yes else LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" @@ -4566,8 +4725,8 @@ fi eval "$wx_cv_use_debug" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4596,7 +4755,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stl was given. if test "${enable_stl+set}" = set; then enableval=$enable_stl; @@ -4605,14 +4763,16 @@ if test "${enable_stl+set}" = set; then else wx_cv_use_stl='wxUSE_STL=no' fi + cache=yes else LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}" @@ -4621,8 +4781,8 @@ fi eval "$wx_cv_use_stl" - if test "$no_cache" != 1; then - echo $wx_cv_use_stl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4651,7 +4811,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-std_iostreams was given. if test "${enable_std_iostreams+set}" = set; then enableval=$enable_std_iostreams; @@ -4660,14 +4819,16 @@ if test "${enable_std_iostreams+set}" = set; then else wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no' fi + cache=yes else LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}" @@ -4676,8 +4837,8 @@ fi eval "$wx_cv_use_std_iostreams" - if test "$no_cache" != 1; then - echo $wx_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4706,7 +4867,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-std_string was given. if test "${enable_std_string+set}" = set; then enableval=$enable_std_string; @@ -4715,14 +4875,16 @@ if test "${enable_std_string+set}" = set; then else wx_cv_use_std_string='wxUSE_STD_STRING=no' fi + cache=yes else LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}" @@ -4731,8 +4893,8 @@ fi eval "$wx_cv_use_std_string" - if test "$no_cache" != 1; then - echo $wx_cv_use_std_string >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4761,7 +4923,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-unicode was given. if test "${enable_unicode+set}" = set; then enableval=$enable_unicode; @@ -4770,14 +4931,16 @@ if test "${enable_unicode+set}" = set; then else wx_cv_use_unicode='wxUSE_UNICODE=no' fi + cache=yes else LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}" @@ -4786,8 +4949,8 @@ fi eval "$wx_cv_use_unicode" - if test "$no_cache" != 1; then - echo $wx_cv_use_unicode >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4816,7 +4979,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mslu was given. if test "${enable_mslu+set}" = set; then enableval=$enable_mslu; @@ -4825,14 +4987,16 @@ if test "${enable_mslu+set}" = set; then else wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no' fi + cache=yes else LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}" @@ -4841,8 +5005,8 @@ fi eval "$wx_cv_use_mslu" - if test "$no_cache" != 1; then - echo $wx_cv_use_mslu >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4862,19 +5026,20 @@ echo "${ECHO_T}$result" >&6; } enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-utf8 was given. if test "${enable_utf8+set}" = set; then enableval=$enable_utf8; wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'" + cache=yes else LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8 @@ -4883,8 +5048,8 @@ fi eval "$wx_cv_use_utf8" - if test "$no_cache" != 1; then - echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp fi { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5 @@ -4903,7 +5068,6 @@ echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-utf8only was given. if test "${enable_utf8only+set}" = set; then enableval=$enable_utf8only; @@ -4912,14 +5076,16 @@ if test "${enable_utf8only+set}" = set; then else wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no' fi + cache=yes else LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}" @@ -4928,8 +5094,8 @@ fi eval "$wx_cv_use_utf8only" - if test "$no_cache" != 1; then - echo $wx_cv_use_utf8only >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -4958,7 +5124,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-extended_rtti was given. if test "${enable_extended_rtti+set}" = set; then enableval=$enable_extended_rtti; @@ -4967,14 +5132,16 @@ if test "${enable_extended_rtti+set}" = set; then else wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no' fi + cache=yes else LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}" @@ -4983,8 +5150,8 @@ fi eval "$wx_cv_use_extended_rtti" - if test "$no_cache" != 1; then - echo $wx_cv_use_extended_rtti >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5015,7 +5182,6 @@ if test "$USE_OS2" = "1"; then { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-omf was given. if test "${enable_omf+set}" = set; then enableval=$enable_omf; @@ -5024,14 +5190,16 @@ if test "${enable_omf+set}" = set; then else wx_cv_use_omf='wxUSE_OMF=no' fi + cache=yes else LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}" @@ -5040,8 +5208,8 @@ fi eval "$wx_cv_use_omf" - if test "$no_cache" != 1; then - echo $wx_cv_use_omf >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5082,7 +5250,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_flag was given. if test "${enable_debug_flag+set}" = set; then enableval=$enable_debug_flag; @@ -5091,14 +5258,16 @@ if test "${enable_debug_flag+set}" = set; then else wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' fi + cache=yes else LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" @@ -5107,8 +5276,8 @@ fi eval "$wx_cv_use_debug_flag" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5137,7 +5306,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_info was given. if test "${enable_debug_info+set}" = set; then enableval=$enable_debug_info; @@ -5146,14 +5314,16 @@ if test "${enable_debug_info+set}" = set; then else wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' fi + cache=yes else LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" @@ -5162,8 +5332,8 @@ fi eval "$wx_cv_use_debug_info" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_info >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5192,7 +5362,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_gdb was given. if test "${enable_debug_gdb+set}" = set; then enableval=$enable_debug_gdb; @@ -5201,14 +5370,16 @@ if test "${enable_debug_gdb+set}" = set; then else wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' fi + cache=yes else LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" @@ -5217,8 +5388,8 @@ fi eval "$wx_cv_use_debug_gdb" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5247,7 +5418,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debug_cntxt was given. if test "${enable_debug_cntxt+set}" = set; then enableval=$enable_debug_cntxt; @@ -5256,14 +5426,16 @@ if test "${enable_debug_cntxt+set}" = set; then else wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' fi + cache=yes else LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" @@ -5272,8 +5444,8 @@ fi eval "$wx_cv_use_debug_cntxt" - if test "$no_cache" != 1; then - echo $wx_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5302,7 +5474,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mem_tracing was given. if test "${enable_mem_tracing+set}" = set; then enableval=$enable_mem_tracing; @@ -5311,14 +5482,16 @@ if test "${enable_mem_tracing+set}" = set; then else wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' fi + cache=yes else LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" @@ -5327,8 +5500,8 @@ fi eval "$wx_cv_use_mem_tracing" - if test "$no_cache" != 1; then - echo $wx_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5357,7 +5530,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-profile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-profile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-profile was given. if test "${enable_profile+set}" = set; then enableval=$enable_profile; @@ -5366,14 +5538,16 @@ if test "${enable_profile+set}" = set; then else wx_cv_use_profile='wxUSE_PROFILE=no' fi + cache=yes else LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}" @@ -5382,8 +5556,8 @@ fi eval "$wx_cv_use_profile" - if test "$no_cache" != 1; then - echo $wx_cv_use_profile >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5412,7 +5586,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_rtti" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_rtti... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-no_rtti was given. if test "${enable_no_rtti+set}" = set; then enableval=$enable_no_rtti; @@ -5421,14 +5594,16 @@ if test "${enable_no_rtti+set}" = set; then else wx_cv_use_no_rtti='wxUSE_NO_RTTI=no' fi + cache=yes else LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}" @@ -5437,8 +5612,8 @@ fi eval "$wx_cv_use_no_rtti" - if test "$no_cache" != 1; then - echo $wx_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5467,7 +5642,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_exceptions" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_exceptions... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-no_exceptions was given. if test "${enable_no_exceptions+set}" = set; then enableval=$enable_no_exceptions; @@ -5476,14 +5650,16 @@ if test "${enable_no_exceptions+set}" = set; then else wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no' fi + cache=yes else LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}" @@ -5492,8 +5668,8 @@ fi eval "$wx_cv_use_no_exceptions" - if test "$no_cache" != 1; then - echo $wx_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5522,7 +5698,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-permissive" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-permissive... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-permissive was given. if test "${enable_permissive+set}" = set; then enableval=$enable_permissive; @@ -5531,14 +5706,16 @@ if test "${enable_permissive+set}" = set; then else wx_cv_use_permissive='wxUSE_PERMISSIVE=no' fi + cache=yes else LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}" @@ -5547,8 +5724,8 @@ fi eval "$wx_cv_use_permissive" - if test "$no_cache" != 1; then - echo $wx_cv_use_permissive >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5577,7 +5754,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-no_deps" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-no_deps... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-no_deps was given. if test "${enable_no_deps+set}" = set; then enableval=$enable_no_deps; @@ -5586,14 +5762,16 @@ if test "${enable_no_deps+set}" = set; then else wx_cv_use_no_deps='wxUSE_NO_DEPS=no' fi + cache=yes else LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}" @@ -5602,8 +5780,8 @@ fi eval "$wx_cv_use_no_deps" - if test "$no_cache" != 1; then - echo $wx_cv_use_no_deps >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5632,7 +5810,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-vararg_macros" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-vararg_macros... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-vararg_macros was given. if test "${enable_vararg_macros+set}" = set; then enableval=$enable_vararg_macros; @@ -5641,14 +5818,16 @@ if test "${enable_vararg_macros+set}" = set; then else wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no' fi + cache=yes else LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}" @@ -5657,8 +5836,8 @@ fi eval "$wx_cv_use_vararg_macros" - if test "$no_cache" != 1; then - echo $wx_cv_use_vararg_macros >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5678,19 +5857,20 @@ echo "${ECHO_T}$result" >&6; } enablestring= { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-universal_binary was given. if test "${enable_universal_binary+set}" = set; then enableval=$enable_universal_binary; wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'" + cache=yes else LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY @@ -5699,8 +5879,8 @@ fi eval "$wx_cv_use_universal_binary" - if test "$no_cache" != 1; then - echo $wx_cv_use_universal_binary >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp fi { echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5 @@ -5720,7 +5900,6 @@ echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat26" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-compat26... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-compat26 was given. if test "${enable_compat26+set}" = set; then enableval=$enable_compat26; @@ -5729,14 +5908,16 @@ if test "${enable_compat26+set}" = set; then else wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no' fi + cache=yes else LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}" @@ -5745,8 +5926,8 @@ fi eval "$wx_cv_use_compat26" - if test "$no_cache" != 1; then - echo $wx_cv_use_compat26 >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5775,7 +5956,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-compat28" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-compat28... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-compat28 was given. if test "${enable_compat28+set}" = set; then enableval=$enable_compat28; @@ -5784,14 +5964,16 @@ if test "${enable_compat28+set}" = set; then else wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no' fi + cache=yes else LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}" @@ -5800,8 +5982,8 @@ fi eval "$wx_cv_use_compat28" - if test "$no_cache" != 1; then - echo $wx_cv_use_compat28 >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5831,7 +6013,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-rpath" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-rpath... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then enableval=$enable_rpath; @@ -5840,14 +6021,16 @@ if test "${enable_rpath+set}" = set; then else wx_cv_use_rpath='wxUSE_RPATH=no' fi + cache=yes else LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}" @@ -5856,8 +6039,8 @@ fi eval "$wx_cv_use_rpath" - if test "$no_cache" != 1; then - echo $wx_cv_use_rpath >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5887,7 +6070,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-objc_uniquifying" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-objc_uniquifying... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-objc_uniquifying was given. if test "${enable_objc_uniquifying+set}" = set; then enableval=$enable_objc_uniquifying; @@ -5896,14 +6078,16 @@ if test "${enable_objc_uniquifying+set}" = set; then else wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no' fi + cache=yes else LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}" @@ -5912,8 +6096,8 @@ fi eval "$wx_cv_use_objc_uniquifying" - if test "$no_cache" != 1; then - echo $wx_cv_use_objc_uniquifying >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -5943,7 +6127,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-visibility" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-visibility was given. if test "${enable_visibility+set}" = set; then enableval=$enable_visibility; @@ -5952,14 +6135,16 @@ if test "${enable_visibility+set}" = set; then else wx_cv_use_visibility='wxUSE_VISIBILITY=no' fi + cache=yes else LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" @@ -5968,8 +6153,8 @@ fi eval "$wx_cv_use_visibility" - if test "$no_cache" != 1; then - echo $wx_cv_use_visibility >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6000,7 +6185,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-intl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-intl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-intl was given. if test "${enable_intl+set}" = set; then enableval=$enable_intl; @@ -6009,14 +6193,16 @@ if test "${enable_intl+set}" = set; then else wx_cv_use_intl='wxUSE_INTL=no' fi + cache=yes else LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}" @@ -6025,8 +6211,8 @@ fi eval "$wx_cv_use_intl" - if test "$no_cache" != 1; then - echo $wx_cv_use_intl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6055,7 +6241,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-config" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-config... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-config was given. if test "${enable_config+set}" = set; then enableval=$enable_config; @@ -6064,14 +6249,16 @@ if test "${enable_config+set}" = set; then else wx_cv_use_config='wxUSE_CONFIG=no' fi + cache=yes else LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}" @@ -6080,8 +6267,8 @@ fi eval "$wx_cv_use_config" - if test "$no_cache" != 1; then - echo $wx_cv_use_config >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6111,7 +6298,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocols" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocols... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocols was given. if test "${enable_protocols+set}" = set; then enableval=$enable_protocols; @@ -6120,14 +6306,16 @@ if test "${enable_protocols+set}" = set; then else wx_cv_use_protocols='wxUSE_PROTOCOL=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" @@ -6136,8 +6324,8 @@ fi eval "$wx_cv_use_protocols" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocols >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6166,7 +6354,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ftp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ftp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ftp was given. if test "${enable_ftp+set}" = set; then enableval=$enable_ftp; @@ -6175,14 +6362,16 @@ if test "${enable_ftp+set}" = set; then else wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" @@ -6191,8 +6380,8 @@ fi eval "$wx_cv_use_ftp" - if test "$no_cache" != 1; then - echo $wx_cv_use_ftp >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6221,7 +6410,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-http" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-http... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-http was given. if test "${enable_http+set}" = set; then enableval=$enable_http; @@ -6230,14 +6418,16 @@ if test "${enable_http+set}" = set; then else wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" @@ -6246,8 +6436,8 @@ fi eval "$wx_cv_use_http" - if test "$no_cache" != 1; then - echo $wx_cv_use_http >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6276,7 +6466,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fileproto" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fileproto... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fileproto was given. if test "${enable_fileproto+set}" = set; then enableval=$enable_fileproto; @@ -6285,14 +6474,16 @@ if test "${enable_fileproto+set}" = set; then else wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" @@ -6301,8 +6492,8 @@ fi eval "$wx_cv_use_fileproto" - if test "$no_cache" != 1; then - echo $wx_cv_use_fileproto >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6331,7 +6522,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sockets" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sockets... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-sockets was given. if test "${enable_sockets+set}" = set; then enableval=$enable_sockets; @@ -6340,14 +6530,16 @@ if test "${enable_sockets+set}" = set; then else wx_cv_use_sockets='wxUSE_SOCKETS=no' fi + cache=yes else LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}" @@ -6356,8 +6548,8 @@ fi eval "$wx_cv_use_sockets" - if test "$no_cache" != 1; then - echo $wx_cv_use_sockets >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6386,7 +6578,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ole" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ole... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ole was given. if test "${enable_ole+set}" = set; then enableval=$enable_ole; @@ -6395,14 +6586,16 @@ if test "${enable_ole+set}" = set; then else wx_cv_use_ole='wxUSE_OLE=no' fi + cache=yes else LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}" @@ -6411,8 +6604,8 @@ fi eval "$wx_cv_use_ole" - if test "$no_cache" != 1; then - echo $wx_cv_use_ole >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6441,7 +6634,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataobj" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dataobj... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dataobj was given. if test "${enable_dataobj+set}" = set; then enableval=$enable_dataobj; @@ -6450,14 +6642,16 @@ if test "${enable_dataobj+set}" = set; then else wx_cv_use_dataobj='wxUSE_DATAOBJ=no' fi + cache=yes else LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}" @@ -6466,8 +6660,8 @@ fi eval "$wx_cv_use_dataobj" - if test "$no_cache" != 1; then - echo $wx_cv_use_dataobj >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6497,7 +6691,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ipc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then enableval=$enable_ipc; @@ -6506,14 +6699,16 @@ if test "${enable_ipc+set}" = set; then else wx_cv_use_ipc='wxUSE_IPC=no' fi + cache=yes else LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}" @@ -6522,8 +6717,8 @@ fi eval "$wx_cv_use_ipc" - if test "$no_cache" != 1; then - echo $wx_cv_use_ipc >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6553,7 +6748,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-baseevtloop" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-baseevtloop... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-baseevtloop was given. if test "${enable_baseevtloop+set}" = set; then enableval=$enable_baseevtloop; @@ -6562,14 +6756,16 @@ if test "${enable_baseevtloop+set}" = set; then else wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no' fi + cache=yes else LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}" @@ -6578,8 +6774,8 @@ fi eval "$wx_cv_use_baseevtloop" - if test "$no_cache" != 1; then - echo $wx_cv_use_baseevtloop >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6606,35 +6802,36 @@ echo "${ECHO_T}$result" >&6; } fi fi - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epoolloop" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-epoolloop... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-epoolloop was given. -if test "${enable_epoolloop+set}" = set; then - enableval=$enable_epoolloop; + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-epollloop" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-epollloop... $ECHO_C" >&6; } + # Check whether --enable-epollloop was given. +if test "${enable_epollloop+set}" = set; then + enableval=$enable_epollloop; if test "$enableval" = yes; then - wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=yes' + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=yes' else - wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=no' + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no' fi + cache=yes else LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi - wx_cv_use_epoolloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" + wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}" fi - eval "$wx_cv_use_epoolloop" - if test "$no_cache" != 1; then - echo $wx_cv_use_epoolloop >> ${wx_arg_cache_file}.tmp + eval "$wx_cv_use_epollloop" + if test "x$cache" = xyes; then + echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6663,7 +6860,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-selectloop" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-selectloop... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-selectloop was given. if test "${enable_selectloop+set}" = set; then enableval=$enable_selectloop; @@ -6672,14 +6868,16 @@ if test "${enable_selectloop+set}" = set; then else wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no' fi + cache=yes else LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}" @@ -6688,8 +6886,8 @@ fi eval "$wx_cv_use_selectloop" - if test "$no_cache" != 1; then - echo $wx_cv_use_selectloop >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6719,7 +6917,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-apple_ieee was given. if test "${enable_apple_ieee+set}" = set; then enableval=$enable_apple_ieee; @@ -6728,14 +6925,16 @@ if test "${enable_apple_ieee+set}" = set; then else wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no' fi + cache=yes else LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}" @@ -6744,8 +6943,8 @@ fi eval "$wx_cv_use_apple_ieee" - if test "$no_cache" != 1; then - echo $wx_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6774,7 +6973,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-arcstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-arcstream... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-arcstream was given. if test "${enable_arcstream+set}" = set; then enableval=$enable_arcstream; @@ -6783,14 +6981,16 @@ if test "${enable_arcstream+set}" = set; then else wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no' fi + cache=yes else LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}" @@ -6799,8 +6999,8 @@ fi eval "$wx_cv_use_arcstream" - if test "$no_cache" != 1; then - echo $wx_cv_use_arcstream >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6829,7 +7029,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-base64" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-base64... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-base64 was given. if test "${enable_base64+set}" = set; then enableval=$enable_base64; @@ -6838,14 +7037,16 @@ if test "${enable_base64+set}" = set; then else wx_cv_use_base64='wxUSE_BASE64=no' fi + cache=yes else LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}" @@ -6854,8 +7055,8 @@ fi eval "$wx_cv_use_base64" - if test "$no_cache" != 1; then - echo $wx_cv_use_base64 >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6884,7 +7085,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-backtrace" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-backtrace... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-backtrace was given. if test "${enable_backtrace+set}" = set; then enableval=$enable_backtrace; @@ -6893,14 +7093,16 @@ if test "${enable_backtrace+set}" = set; then else wx_cv_use_backtrace='wxUSE_STACKWALKER=no' fi + cache=yes else LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}" @@ -6909,8 +7111,8 @@ fi eval "$wx_cv_use_backtrace" - if test "$no_cache" != 1; then - echo $wx_cv_use_backtrace >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6939,7 +7141,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-catch_segvs was given. if test "${enable_catch_segvs+set}" = set; then enableval=$enable_catch_segvs; @@ -6948,14 +7149,16 @@ if test "${enable_catch_segvs+set}" = set; then else wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no' fi + cache=yes else LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}" @@ -6964,8 +7167,8 @@ fi eval "$wx_cv_use_catch_segvs" - if test "$no_cache" != 1; then - echo $wx_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -6994,7 +7197,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-cmdline was given. if test "${enable_cmdline+set}" = set; then enableval=$enable_cmdline; @@ -7003,14 +7205,16 @@ if test "${enable_cmdline+set}" = set; then else wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no' fi + cache=yes else LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}" @@ -7019,8 +7223,8 @@ fi eval "$wx_cv_use_cmdline" - if test "$no_cache" != 1; then - echo $wx_cv_use_cmdline >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7049,7 +7253,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-datetime was given. if test "${enable_datetime+set}" = set; then enableval=$enable_datetime; @@ -7058,14 +7261,16 @@ if test "${enable_datetime+set}" = set; then else wx_cv_use_datetime='wxUSE_DATETIME=no' fi + cache=yes else LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}" @@ -7074,8 +7279,8 @@ fi eval "$wx_cv_use_datetime" - if test "$no_cache" != 1; then - echo $wx_cv_use_datetime >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7104,7 +7309,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debugreport" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-debugreport... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-debugreport was given. if test "${enable_debugreport+set}" = set; then enableval=$enable_debugreport; @@ -7113,14 +7317,16 @@ if test "${enable_debugreport+set}" = set; then else wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no' fi + cache=yes else LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}" @@ -7129,8 +7335,8 @@ fi eval "$wx_cv_use_debugreport" - if test "$no_cache" != 1; then - echo $wx_cv_use_debugreport >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7159,7 +7365,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dialupman was given. if test "${enable_dialupman+set}" = set; then enableval=$enable_dialupman; @@ -7168,14 +7373,16 @@ if test "${enable_dialupman+set}" = set; then else wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no' fi + cache=yes else LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}" @@ -7184,8 +7391,8 @@ fi eval "$wx_cv_use_dialupman" - if test "$no_cache" != 1; then - echo $wx_cv_use_dialupman >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7214,7 +7421,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynlib" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dynlib... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dynlib was given. if test "${enable_dynlib+set}" = set; then enableval=$enable_dynlib; @@ -7223,14 +7429,16 @@ if test "${enable_dynlib+set}" = set; then else wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no' fi + cache=yes else LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}" @@ -7239,8 +7447,8 @@ fi eval "$wx_cv_use_dynlib" - if test "$no_cache" != 1; then - echo $wx_cv_use_dynlib >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7269,7 +7477,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dynamicloader" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dynamicloader... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dynamicloader was given. if test "${enable_dynamicloader+set}" = set; then enableval=$enable_dynamicloader; @@ -7278,14 +7485,16 @@ if test "${enable_dynamicloader+set}" = set; then else wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no' fi + cache=yes else LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}" @@ -7294,8 +7503,8 @@ fi eval "$wx_cv_use_dynamicloader" - if test "$no_cache" != 1; then - echo $wx_cv_use_dynamicloader >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7324,7 +7533,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-exceptions was given. if test "${enable_exceptions+set}" = set; then enableval=$enable_exceptions; @@ -7333,14 +7541,16 @@ if test "${enable_exceptions+set}" = set; then else wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no' fi + cache=yes else LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}" @@ -7349,8 +7559,8 @@ fi eval "$wx_cv_use_exceptions" - if test "$no_cache" != 1; then - echo $wx_cv_use_exceptions >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7379,7 +7589,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ffile was given. if test "${enable_ffile+set}" = set; then enableval=$enable_ffile; @@ -7388,14 +7597,16 @@ if test "${enable_ffile+set}" = set; then else wx_cv_use_ffile='wxUSE_FFILE=no' fi + cache=yes else LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}" @@ -7404,8 +7615,8 @@ fi eval "$wx_cv_use_ffile" - if test "$no_cache" != 1; then - echo $wx_cv_use_ffile >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7434,7 +7645,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-file was given. if test "${enable_file+set}" = set; then enableval=$enable_file; @@ -7443,14 +7653,16 @@ if test "${enable_file+set}" = set; then else wx_cv_use_file='wxUSE_FILE=no' fi + cache=yes else LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}" @@ -7459,8 +7671,8 @@ fi eval "$wx_cv_use_file" - if test "$no_cache" != 1; then - echo $wx_cv_use_file >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7489,7 +7701,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-filesystem was given. if test "${enable_filesystem+set}" = set; then enableval=$enable_filesystem; @@ -7498,14 +7709,16 @@ if test "${enable_filesystem+set}" = set; then else wx_cv_use_filesystem='wxUSE_FILESYSTEM=no' fi + cache=yes else LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}" @@ -7514,8 +7727,8 @@ fi eval "$wx_cv_use_filesystem" - if test "$no_cache" != 1; then - echo $wx_cv_use_filesystem >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7532,6 +7745,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}-fontenum" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-fontenum... $ECHO_C" >&6; } + # Check whether --enable-fontenum was given. +if test "${enable_fontenum+set}" = set; then + enableval=$enable_fontenum; + if test "$enableval" = yes; then + wx_cv_use_fontenum='wxUSE_FONTENUM=yes' + else + wx_cv_use_fontenum='wxUSE_FONTENUM=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_FONTENUM=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_fontenum='wxUSE_FONTENUM=${'DEFAULT_wxUSE_FONTENUM":-$defaultval}" + +fi + + + eval "$wx_cv_use_fontenum" + if test "x$cache" = xyes; then + echo "wxUSE_FONTENUM=$wxUSE_FONTENUM" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FONTENUM = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_FONTENUM + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -7544,7 +7813,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fontmap was given. if test "${enable_fontmap+set}" = set; then enableval=$enable_fontmap; @@ -7553,14 +7821,16 @@ if test "${enable_fontmap+set}" = set; then else wx_cv_use_fontmap='wxUSE_FONTMAP=no' fi + cache=yes else LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}" @@ -7569,8 +7839,8 @@ fi eval "$wx_cv_use_fontmap" - if test "$no_cache" != 1; then - echo $wx_cv_use_fontmap >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7599,7 +7869,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_archive" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_archive... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fs_archive was given. if test "${enable_fs_archive+set}" = set; then enableval=$enable_fs_archive; @@ -7608,14 +7877,16 @@ if test "${enable_fs_archive+set}" = set; then else wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no' fi + cache=yes else LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}" @@ -7624,8 +7895,8 @@ fi eval "$wx_cv_use_fs_archive" - if test "$no_cache" != 1; then - echo $wx_cv_use_fs_archive >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7654,7 +7925,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fs_inet was given. if test "${enable_fs_inet+set}" = set; then enableval=$enable_fs_inet; @@ -7663,14 +7933,16 @@ if test "${enable_fs_inet+set}" = set; then else wx_cv_use_fs_inet='wxUSE_FS_INET=no' fi + cache=yes else LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}" @@ -7679,8 +7951,8 @@ fi eval "$wx_cv_use_fs_inet" - if test "$no_cache" != 1; then - echo $wx_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7709,7 +7981,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fs_zip was given. if test "${enable_fs_zip+set}" = set; then enableval=$enable_fs_zip; @@ -7718,14 +7989,16 @@ if test "${enable_fs_zip+set}" = set; then else wx_cv_use_fs_zip='wxUSE_FS_ZIP=no' fi + cache=yes else LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}" @@ -7734,8 +8007,8 @@ fi eval "$wx_cv_use_fs_zip" - if test "$no_cache" != 1; then - echo $wx_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7764,7 +8037,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-geometry was given. if test "${enable_geometry+set}" = set; then enableval=$enable_geometry; @@ -7773,14 +8045,16 @@ if test "${enable_geometry+set}" = set; then else wx_cv_use_geometry='wxUSE_GEOMETRY=no' fi + cache=yes else LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}" @@ -7789,8 +8063,8 @@ fi eval "$wx_cv_use_geometry" - if test "$no_cache" != 1; then - echo $wx_cv_use_geometry >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7819,7 +8093,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-log was given. if test "${enable_log+set}" = set; then enableval=$enable_log; @@ -7828,14 +8101,16 @@ if test "${enable_log+set}" = set; then else wx_cv_use_log='wxUSE_LOG=no' fi + cache=yes else LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}" @@ -7844,8 +8119,8 @@ fi eval "$wx_cv_use_log" - if test "$no_cache" != 1; then - echo $wx_cv_use_log >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7874,7 +8149,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-longlong was given. if test "${enable_longlong+set}" = set; then enableval=$enable_longlong; @@ -7883,14 +8157,16 @@ if test "${enable_longlong+set}" = set; then else wx_cv_use_longlong='wxUSE_LONGLONG=no' fi + cache=yes else LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}" @@ -7899,8 +8175,8 @@ fi eval "$wx_cv_use_longlong" - if test "$no_cache" != 1; then - echo $wx_cv_use_longlong >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7929,7 +8205,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mimetype was given. if test "${enable_mimetype+set}" = set; then enableval=$enable_mimetype; @@ -7938,14 +8213,16 @@ if test "${enable_mimetype+set}" = set; then else wx_cv_use_mimetype='wxUSE_MIMETYPE=no' fi + cache=yes else LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}" @@ -7954,8 +8231,8 @@ fi eval "$wx_cv_use_mimetype" - if test "$no_cache" != 1; then - echo $wx_cv_use_mimetype >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -7984,7 +8261,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-snglinst was given. if test "${enable_snglinst+set}" = set; then enableval=$enable_snglinst; @@ -7993,14 +8269,16 @@ if test "${enable_snglinst+set}" = set; then else wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no' fi + cache=yes else LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}" @@ -8009,8 +8287,8 @@ fi eval "$wx_cv_use_snglinst" - if test "$no_cache" != 1; then - echo $wx_cv_use_snglinst >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8039,7 +8317,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stdpaths" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stdpaths... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stdpaths was given. if test "${enable_stdpaths+set}" = set; then enableval=$enable_stdpaths; @@ -8048,14 +8325,16 @@ if test "${enable_stdpaths+set}" = set; then else wx_cv_use_stdpaths='wxUSE_STDPATHS=no' fi + cache=yes else LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}" @@ -8064,8 +8343,8 @@ fi eval "$wx_cv_use_stdpaths" - if test "$no_cache" != 1; then - echo $wx_cv_use_stdpaths >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8094,7 +8373,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stopwatch was given. if test "${enable_stopwatch+set}" = set; then enableval=$enable_stopwatch; @@ -8103,14 +8381,16 @@ if test "${enable_stopwatch+set}" = set; then else wx_cv_use_stopwatch='wxUSE_STOPWATCH=no' fi + cache=yes else LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}" @@ -8119,8 +8399,8 @@ fi eval "$wx_cv_use_stopwatch" - if test "$no_cache" != 1; then - echo $wx_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8149,7 +8429,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-streams was given. if test "${enable_streams+set}" = set; then enableval=$enable_streams; @@ -8158,14 +8437,16 @@ if test "${enable_streams+set}" = set; then else wx_cv_use_streams='wxUSE_STREAMS=no' fi + cache=yes else LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}" @@ -8174,8 +8455,8 @@ fi eval "$wx_cv_use_streams" - if test "$no_cache" != 1; then - echo $wx_cv_use_streams >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8204,7 +8485,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-system_options was given. if test "${enable_system_options+set}" = set; then enableval=$enable_system_options; @@ -8213,14 +8493,16 @@ if test "${enable_system_options+set}" = set; then else wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no' fi + cache=yes else LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}" @@ -8229,8 +8511,8 @@ fi eval "$wx_cv_use_system_options" - if test "$no_cache" != 1; then - echo $wx_cv_use_system_options >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8259,7 +8541,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tarstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tarstream... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tarstream was given. if test "${enable_tarstream+set}" = set; then enableval=$enable_tarstream; @@ -8268,14 +8549,16 @@ if test "${enable_tarstream+set}" = set; then else wx_cv_use_tarstream='wxUSE_TARSTREAM=no' fi + cache=yes else LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}" @@ -8284,8 +8567,8 @@ fi eval "$wx_cv_use_tarstream" - if test "$no_cache" != 1; then - echo $wx_cv_use_tarstream >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8314,7 +8597,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textbuf was given. if test "${enable_textbuf+set}" = set; then enableval=$enable_textbuf; @@ -8323,14 +8605,16 @@ if test "${enable_textbuf+set}" = set; then else wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no' fi + cache=yes else LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}" @@ -8339,8 +8623,8 @@ fi eval "$wx_cv_use_textbuf" - if test "$no_cache" != 1; then - echo $wx_cv_use_textbuf >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8369,7 +8653,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textfile was given. if test "${enable_textfile+set}" = set; then enableval=$enable_textfile; @@ -8378,14 +8661,16 @@ if test "${enable_textfile+set}" = set; then else wx_cv_use_textfile='wxUSE_TEXTFILE=no' fi + cache=yes else LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}" @@ -8394,8 +8679,8 @@ fi eval "$wx_cv_use_textfile" - if test "$no_cache" != 1; then - echo $wx_cv_use_textfile >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8424,7 +8709,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-timer was given. if test "${enable_timer+set}" = set; then enableval=$enable_timer; @@ -8433,14 +8717,16 @@ if test "${enable_timer+set}" = set; then else wx_cv_use_timer='wxUSE_TIMER=no' fi + cache=yes else LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}" @@ -8449,8 +8735,8 @@ fi eval "$wx_cv_use_timer" - if test "$no_cache" != 1; then - echo $wx_cv_use_timer >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8479,7 +8765,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-sound was given. if test "${enable_sound+set}" = set; then enableval=$enable_sound; @@ -8488,14 +8773,16 @@ if test "${enable_sound+set}" = set; then else wx_cv_use_sound='wxUSE_SOUND=no' fi + cache=yes else LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}" @@ -8504,8 +8791,8 @@ fi eval "$wx_cv_use_sound" - if test "$no_cache" != 1; then - echo $wx_cv_use_sound >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8534,7 +8821,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mediactrl was given. if test "${enable_mediactrl+set}" = set; then enableval=$enable_mediactrl; @@ -8543,14 +8829,16 @@ if test "${enable_mediactrl+set}" = set; then else wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}" @@ -8559,8 +8847,8 @@ fi eval "$wx_cv_use_mediactrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_mediactrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8589,7 +8877,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gstreamer8 was given. if test "${enable_gstreamer8+set}" = set; then enableval=$enable_gstreamer8; @@ -8598,14 +8885,16 @@ if test "${enable_gstreamer8+set}" = set; then else wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no' fi + cache=yes else LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}" @@ -8614,8 +8903,8 @@ fi eval "$wx_cv_use_gstreamer8" - if test "$no_cache" != 1; then - echo $wx_cv_use_gstreamer8 >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8644,7 +8933,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-printfposparam was given. if test "${enable_printfposparam+set}" = set; then enableval=$enable_printfposparam; @@ -8653,14 +8941,16 @@ if test "${enable_printfposparam+set}" = set; then else wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no' fi + cache=yes else LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}" @@ -8669,8 +8959,8 @@ fi eval "$wx_cv_use_printfposparam" - if test "$no_cache" != 1; then - echo $wx_cv_use_printfposparam >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8699,7 +8989,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-zipstream" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-zipstream... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-zipstream was given. if test "${enable_zipstream+set}" = set; then enableval=$enable_zipstream; @@ -8708,14 +8997,16 @@ if test "${enable_zipstream+set}" = set; then else wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no' fi + cache=yes else LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}" @@ -8724,8 +9015,8 @@ fi eval "$wx_cv_use_zipstream" - if test "$no_cache" != 1; then - echo $wx_cv_use_zipstream >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8755,7 +9046,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-url" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-url... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-url was given. if test "${enable_url+set}" = set; then enableval=$enable_url; @@ -8764,14 +9054,16 @@ if test "${enable_url+set}" = set; then else wx_cv_use_url='wxUSE_URL=no' fi + cache=yes else LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}" @@ -8780,8 +9072,8 @@ fi eval "$wx_cv_use_url" - if test "$no_cache" != 1; then - echo $wx_cv_use_url >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8810,7 +9102,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-variant was given. if test "${enable_variant+set}" = set; then enableval=$enable_variant; @@ -8819,14 +9110,16 @@ if test "${enable_variant+set}" = set; then else wx_cv_use_variant='wxUSE_VARIANT=no' fi + cache=yes else LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}" @@ -8835,8 +9128,8 @@ fi eval "$wx_cv_use_variant" - if test "$no_cache" != 1; then - echo $wx_cv_use_variant >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8865,7 +9158,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol was given. if test "${enable_protocol+set}" = set; then enableval=$enable_protocol; @@ -8874,14 +9166,16 @@ if test "${enable_protocol+set}" = set; then else wx_cv_use_protocol='wxUSE_PROTOCOL=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}" @@ -8890,8 +9184,8 @@ fi eval "$wx_cv_use_protocol" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8920,7 +9214,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_http" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_http... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol_http was given. if test "${enable_protocol_http+set}" = set; then enableval=$enable_protocol_http; @@ -8929,14 +9222,16 @@ if test "${enable_protocol_http+set}" = set; then else wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}" @@ -8945,8 +9240,8 @@ fi eval "$wx_cv_use_protocol_http" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol_http >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -8975,7 +9270,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_ftp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_ftp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol_ftp was given. if test "${enable_protocol_ftp+set}" = set; then enableval=$enable_protocol_ftp; @@ -8984,14 +9278,16 @@ if test "${enable_protocol_ftp+set}" = set; then else wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}" @@ -9000,8 +9296,8 @@ fi eval "$wx_cv_use_protocol_ftp" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol_ftp >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9030,7 +9326,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-protocol_file" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-protocol_file... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-protocol_file was given. if test "${enable_protocol_file+set}" = set; then enableval=$enable_protocol_file; @@ -9039,14 +9334,16 @@ if test "${enable_protocol_file+set}" = set; then else wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no' fi + cache=yes else LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}" @@ -9055,8 +9352,8 @@ fi eval "$wx_cv_use_protocol_file" - if test "$no_cache" != 1; then - echo $wx_cv_use_protocol_file >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9086,7 +9383,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-threads" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-threads... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-threads was given. if test "${enable_threads+set}" = set; then enableval=$enable_threads; @@ -9095,14 +9391,16 @@ if test "${enable_threads+set}" = set; then else wx_cv_use_threads='wxUSE_THREADS=no' fi + cache=yes else LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}" @@ -9111,8 +9409,8 @@ fi eval "$wx_cv_use_threads" - if test "$no_cache" != 1; then - echo $wx_cv_use_threads >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9129,6 +9427,119 @@ 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 + 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 + + LINE=`grep "^wxUSE_REGKEY=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_regkey='wxUSE_REGKEY=${'DEFAULT_wxUSE_REGKEY":-$defaultval}" + +fi + + + eval "$wx_cv_use_regkey" + if test "x$cache" = xyes; then + echo "wxUSE_REGKEY=$wxUSE_REGKEY" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_REGKEY = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_REGKEY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_GUI" = "yes"; then @@ -9145,7 +9556,6 @@ if test "$wxUSE_GUI" = "yes"; then { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-docview" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-docview... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-docview was given. if test "${enable_docview+set}" = set; then enableval=$enable_docview; @@ -9154,14 +9564,16 @@ if test "${enable_docview+set}" = set; then else wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no' fi + cache=yes else LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}" @@ -9170,8 +9582,8 @@ fi eval "$wx_cv_use_docview" - if test "$no_cache" != 1; then - echo $wx_cv_use_docview >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9200,7 +9612,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-help" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-help... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-help was given. if test "${enable_help+set}" = set; then enableval=$enable_help; @@ -9209,14 +9620,16 @@ if test "${enable_help+set}" = set; then else wx_cv_use_help='wxUSE_HELP=no' fi + cache=yes else LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}" @@ -9225,8 +9638,8 @@ fi eval "$wx_cv_use_help" - if test "$no_cache" != 1; then - echo $wx_cv_use_help >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9255,7 +9668,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mshtmlhelp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mshtmlhelp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mshtmlhelp was given. if test "${enable_mshtmlhelp+set}" = set; then enableval=$enable_mshtmlhelp; @@ -9264,14 +9676,16 @@ if test "${enable_mshtmlhelp+set}" = set; then else wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no' fi + cache=yes else LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}" @@ -9280,8 +9694,8 @@ fi eval "$wx_cv_use_mshtmlhelp" - if test "$no_cache" != 1; then - echo $wx_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9310,7 +9724,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-html" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-html... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-html was given. if test "${enable_html+set}" = set; then enableval=$enable_html; @@ -9319,14 +9732,16 @@ if test "${enable_html+set}" = set; then else wx_cv_use_html='wxUSE_HTML=no' fi + cache=yes else LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}" @@ -9335,8 +9750,8 @@ fi eval "$wx_cv_use_html" - if test "$no_cache" != 1; then - echo $wx_cv_use_html >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9365,7 +9780,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-htmlhelp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-htmlhelp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-htmlhelp was given. if test "${enable_htmlhelp+set}" = set; then enableval=$enable_htmlhelp; @@ -9374,14 +9788,16 @@ if test "${enable_htmlhelp+set}" = set; then else wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no' fi + cache=yes else LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}" @@ -9390,8 +9806,8 @@ fi eval "$wx_cv_use_htmlhelp" - if test "$no_cache" != 1; then - echo $wx_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9420,7 +9836,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xrc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-xrc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-xrc was given. if test "${enable_xrc+set}" = set; then enableval=$enable_xrc; @@ -9429,14 +9844,16 @@ if test "${enable_xrc+set}" = set; then else wx_cv_use_xrc='wxUSE_XRC=no' fi + cache=yes else LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}" @@ -9445,8 +9862,8 @@ fi eval "$wx_cv_use_xrc" - if test "$no_cache" != 1; then - echo $wx_cv_use_xrc >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9475,7 +9892,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-aui... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-aui was given. if test "${enable_aui+set}" = set; then enableval=$enable_aui; @@ -9484,14 +9900,16 @@ if test "${enable_aui+set}" = set; then else wx_cv_use_aui='wxUSE_AUI=no' fi + cache=yes else LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}" @@ -9500,8 +9918,8 @@ fi eval "$wx_cv_use_aui" - if test "$no_cache" != 1; then - echo $wx_cv_use_aui >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9530,7 +9948,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stc was given. if test "${enable_stc+set}" = set; then enableval=$enable_stc; @@ -9539,14 +9956,16 @@ if test "${enable_stc+set}" = set; then else wx_cv_use_stc='wxUSE_STC=no' fi + cache=yes else LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}" @@ -9555,8 +9974,8 @@ fi eval "$wx_cv_use_stc" - if test "$no_cache" != 1; then - echo $wx_cv_use_stc >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9585,7 +10004,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-constraints" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-constraints... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-constraints was given. if test "${enable_constraints+set}" = set; then enableval=$enable_constraints; @@ -9594,14 +10012,16 @@ if test "${enable_constraints+set}" = set; then else wx_cv_use_constraints='wxUSE_CONSTRAINTS=no' fi + cache=yes else LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}" @@ -9610,8 +10030,8 @@ fi eval "$wx_cv_use_constraints" - if test "$no_cache" != 1; then - echo $wx_cv_use_constraints >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9640,7 +10060,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-printarch was given. if test "${enable_printarch+set}" = set; then enableval=$enable_printarch; @@ -9649,14 +10068,16 @@ if test "${enable_printarch+set}" = set; then else wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no' fi + cache=yes else LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}" @@ -9665,8 +10086,8 @@ fi eval "$wx_cv_use_printarch" - if test "$no_cache" != 1; then - echo $wx_cv_use_printarch >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9695,7 +10116,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mdi was given. if test "${enable_mdi+set}" = set; then enableval=$enable_mdi; @@ -9704,14 +10124,16 @@ if test "${enable_mdi+set}" = set; then else wx_cv_use_mdi='wxUSE_MDI=no' fi + cache=yes else LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}" @@ -9720,8 +10142,8 @@ fi eval "$wx_cv_use_mdi" - if test "$no_cache" != 1; then - echo $wx_cv_use_mdi >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9750,7 +10172,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mdidoc was given. if test "${enable_mdidoc+set}" = set; then enableval=$enable_mdidoc; @@ -9759,14 +10180,16 @@ if test "${enable_mdidoc+set}" = set; then else wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no' fi + cache=yes else LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}" @@ -9775,8 +10198,8 @@ fi eval "$wx_cv_use_mdidoc" - if test "$no_cache" != 1; then - echo $wx_cv_use_mdidoc >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9805,7 +10228,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-loggui was given. if test "${enable_loggui+set}" = set; then enableval=$enable_loggui; @@ -9814,14 +10236,16 @@ if test "${enable_loggui+set}" = set; then else wx_cv_use_loggui='wxUSE_LOGGUI=no' fi + cache=yes else LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}" @@ -9830,8 +10254,8 @@ fi eval "$wx_cv_use_loggui" - if test "$no_cache" != 1; then - echo $wx_cv_use_loggui >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9860,7 +10284,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-logwin was given. if test "${enable_logwin+set}" = set; then enableval=$enable_logwin; @@ -9869,14 +10292,16 @@ if test "${enable_logwin+set}" = set; then else wx_cv_use_logwin='wxUSE_LOGWINDOW=no' fi + cache=yes else LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}" @@ -9885,8 +10310,8 @@ fi eval "$wx_cv_use_logwin" - if test "$no_cache" != 1; then - echo $wx_cv_use_logwin >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9915,7 +10340,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-logdialog was given. if test "${enable_logdialog+set}" = set; then enableval=$enable_logdialog; @@ -9924,14 +10348,16 @@ if test "${enable_logdialog+set}" = set; then else wx_cv_use_logdialog='wxUSE_LOGDIALOG=no' fi + cache=yes else LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}" @@ -9940,8 +10366,8 @@ fi eval "$wx_cv_use_logdialog" - if test "$no_cache" != 1; then - echo $wx_cv_use_logdialog >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -9970,7 +10396,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-webkit" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-webkit was given. if test "${enable_webkit+set}" = set; then enableval=$enable_webkit; @@ -9979,14 +10404,16 @@ if test "${enable_webkit+set}" = set; then else wx_cv_use_webkit='wxUSE_WEBKIT=no' fi + cache=yes else LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" @@ -9995,8 +10422,8 @@ fi eval "$wx_cv_use_webkit" - if test "$no_cache" != 1; then - echo $wx_cv_use_webkit >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10025,7 +10452,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richtext" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-richtext... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-richtext was given. if test "${enable_richtext+set}" = set; then enableval=$enable_richtext; @@ -10034,14 +10460,16 @@ if test "${enable_richtext+set}" = set; then else wx_cv_use_richtext='wxUSE_RICHTEXT=no' fi + cache=yes else LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}" @@ -10050,8 +10478,8 @@ fi eval "$wx_cv_use_richtext" - if test "$no_cache" != 1; then - echo $wx_cv_use_richtext >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10080,7 +10508,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-graphics_ctx was given. if test "${enable_graphics_ctx+set}" = set; then enableval=$enable_graphics_ctx; @@ -10089,14 +10516,16 @@ if test "${enable_graphics_ctx+set}" = set; then else wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no' fi + cache=yes else LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}" @@ -10105,8 +10534,8 @@ fi eval "$wx_cv_use_graphics_ctx" - if test "$no_cache" != 1; then - echo $wx_cv_use_graphics_ctx >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10135,7 +10564,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-postscript was given. if test "${enable_postscript+set}" = set; then enableval=$enable_postscript; @@ -10144,14 +10572,16 @@ if test "${enable_postscript+set}" = set; then else wx_cv_use_postscript='wxUSE_POSTSCRIPT=no' fi + cache=yes else LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}" @@ -10160,8 +10590,8 @@ fi eval "$wx_cv_use_postscript" - if test "$no_cache" != 1; then - echo $wx_cv_use_postscript >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10190,7 +10620,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-svg was given. if test "${enable_svg+set}" = set; then enableval=$enable_svg; @@ -10199,14 +10628,16 @@ if test "${enable_svg+set}" = set; then else wx_cv_use_svg='wxUSE_SVG=no' fi + cache=yes else LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}" @@ -10215,8 +10646,8 @@ fi eval "$wx_cv_use_svg" - if test "$no_cache" != 1; then - echo $wx_cv_use_svg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10247,7 +10678,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-clipboard" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-clipboard... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-clipboard was given. if test "${enable_clipboard+set}" = set; then enableval=$enable_clipboard; @@ -10256,14 +10686,16 @@ if test "${enable_clipboard+set}" = set; then else wx_cv_use_clipboard='wxUSE_CLIPBOARD=no' fi + cache=yes else LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}" @@ -10272,8 +10704,8 @@ fi eval "$wx_cv_use_clipboard" - if test "$no_cache" != 1; then - echo $wx_cv_use_clipboard >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10302,7 +10734,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dnd" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dnd... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dnd was given. if test "${enable_dnd+set}" = set; then enableval=$enable_dnd; @@ -10311,14 +10742,16 @@ if test "${enable_dnd+set}" = set; then else wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no' fi + cache=yes else LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}" @@ -10327,8 +10760,8 @@ fi eval "$wx_cv_use_dnd" - if test "$no_cache" != 1; then - echo $wx_cv_use_dnd >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10357,7 +10790,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-metafile was given. if test "${enable_metafile+set}" = set; then enableval=$enable_metafile; @@ -10366,14 +10798,16 @@ if test "${enable_metafile+set}" = set; then else wx_cv_use_metafile='wxUSE_METAFILE=no' fi + cache=yes else LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" @@ -10382,8 +10816,8 @@ fi eval "$wx_cv_use_metafile" - if test "$no_cache" != 1; then - echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10415,7 +10849,6 @@ DEFAULT_wxUSE_CONTROLS=none { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-controls" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-controls... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-controls was given. if test "${enable_controls+set}" = set; then enableval=$enable_controls; @@ -10424,14 +10857,16 @@ if test "${enable_controls+set}" = set; then else wx_cv_use_controls='wxUSE_CONTROLS=no' fi + cache=yes else LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}" @@ -10440,8 +10875,8 @@ fi eval "$wx_cv_use_controls" - if test "$no_cache" != 1; then - echo $wx_cv_use_controls >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10477,6 +10912,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_DETECT_SM=yes DEFAULT_wxUSE_DIRPICKERCTRL=yes + DEFAULT_wxUSE_FILECTRL=yes DEFAULT_wxUSE_FILEPICKERCTRL=yes DEFAULT_wxUSE_FONTPICKERCTRL=yes DEFAULT_wxUSE_GAUGE=yes @@ -10530,6 +10966,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_DETECT_SM=no DEFAULT_wxUSE_DIRPICKERCTRL=no + DEFAULT_wxUSE_FILECTRL=no DEFAULT_wxUSE_FILEPICKERCTRL=no DEFAULT_wxUSE_FONTPICKERCTRL=no DEFAULT_wxUSE_GAUGE=no @@ -10579,7 +11016,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accel" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-accel... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-accel was given. if test "${enable_accel+set}" = set; then enableval=$enable_accel; @@ -10588,14 +11024,16 @@ if test "${enable_accel+set}" = set; then else wx_cv_use_accel='wxUSE_ACCEL=no' fi + cache=yes else LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}" @@ -10604,8 +11042,8 @@ fi eval "$wx_cv_use_accel" - if test "$no_cache" != 1; then - echo $wx_cv_use_accel >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10634,7 +11072,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-animatectrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-animatectrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-animatectrl was given. if test "${enable_animatectrl+set}" = set; then enableval=$enable_animatectrl; @@ -10643,14 +11080,16 @@ if test "${enable_animatectrl+set}" = set; then else wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}" @@ -10659,8 +11098,8 @@ fi eval "$wx_cv_use_animatectrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_animatectrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10689,7 +11128,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-button was given. if test "${enable_button+set}" = set; then enableval=$enable_button; @@ -10698,14 +11136,16 @@ if test "${enable_button+set}" = set; then else wx_cv_use_button='wxUSE_BUTTON=no' fi + cache=yes else LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}" @@ -10714,8 +11154,8 @@ fi eval "$wx_cv_use_button" - if test "$no_cache" != 1; then - echo $wx_cv_use_button >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10744,7 +11184,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-bmpbutton was given. if test "${enable_bmpbutton+set}" = set; then enableval=$enable_bmpbutton; @@ -10753,14 +11192,16 @@ if test "${enable_bmpbutton+set}" = set; then else wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no' fi + cache=yes else LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}" @@ -10769,8 +11210,8 @@ fi eval "$wx_cv_use_bmpbutton" - if test "$no_cache" != 1; then - echo $wx_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10799,7 +11240,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-bmpcombobox was given. if test "${enable_bmpcombobox+set}" = set; then enableval=$enable_bmpcombobox; @@ -10808,14 +11248,16 @@ if test "${enable_bmpcombobox+set}" = set; then else wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}" @@ -10824,8 +11266,8 @@ fi eval "$wx_cv_use_bmpcombobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_bmpcombobox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10854,7 +11296,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-calendar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-calendar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-calendar was given. if test "${enable_calendar+set}" = set; then enableval=$enable_calendar; @@ -10863,14 +11304,16 @@ if test "${enable_calendar+set}" = set; then else wx_cv_use_calendar='wxUSE_CALCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}" @@ -10879,8 +11322,8 @@ fi eval "$wx_cv_use_calendar" - if test "$no_cache" != 1; then - echo $wx_cv_use_calendar >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10909,7 +11352,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-caret" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-caret... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-caret was given. if test "${enable_caret+set}" = set; then enableval=$enable_caret; @@ -10918,14 +11360,16 @@ if test "${enable_caret+set}" = set; then else wx_cv_use_caret='wxUSE_CARET=no' fi + cache=yes else LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}" @@ -10934,8 +11378,8 @@ fi eval "$wx_cv_use_caret" - if test "$no_cache" != 1; then - echo $wx_cv_use_caret >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -10964,7 +11408,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checkbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-checkbox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-checkbox was given. if test "${enable_checkbox+set}" = set; then enableval=$enable_checkbox; @@ -10973,14 +11416,16 @@ if test "${enable_checkbox+set}" = set; then else wx_cv_use_checkbox='wxUSE_CHECKBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}" @@ -10989,8 +11434,8 @@ fi eval "$wx_cv_use_checkbox" - if test "$no_cache" != 1; then - echo $wx_cv_use_checkbox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11019,7 +11464,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-checklst" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-checklst... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-checklst was given. if test "${enable_checklst+set}" = set; then enableval=$enable_checklst; @@ -11028,14 +11472,16 @@ if test "${enable_checklst+set}" = set; then else wx_cv_use_checklst='wxUSE_CHECKLST=no' fi + cache=yes else LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}" @@ -11044,8 +11490,8 @@ fi eval "$wx_cv_use_checklst" - if test "$no_cache" != 1; then - echo $wx_cv_use_checklst >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11074,7 +11520,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choice" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choice... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-choice was given. if test "${enable_choice+set}" = set; then enableval=$enable_choice; @@ -11083,14 +11528,16 @@ if test "${enable_choice+set}" = set; then else wx_cv_use_choice='wxUSE_CHOICE=no' fi + cache=yes else LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}" @@ -11099,8 +11546,8 @@ fi eval "$wx_cv_use_choice" - if test "$no_cache" != 1; then - echo $wx_cv_use_choice >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11129,7 +11576,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choicebook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-choicebook was given. if test "${enable_choicebook+set}" = set; then enableval=$enable_choicebook; @@ -11138,14 +11584,16 @@ if test "${enable_choicebook+set}" = set; then else wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no' fi + cache=yes else LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}" @@ -11154,8 +11602,8 @@ fi eval "$wx_cv_use_choicebook" - if test "$no_cache" != 1; then - echo $wx_cv_use_choicebook >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11184,7 +11632,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-collpane" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-collpane... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-collpane was given. if test "${enable_collpane+set}" = set; then enableval=$enable_collpane; @@ -11193,14 +11640,16 @@ if test "${enable_collpane+set}" = set; then else wx_cv_use_collpane='wxUSE_COLLPANE=no' fi + cache=yes else LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}" @@ -11209,8 +11658,8 @@ fi eval "$wx_cv_use_collpane" - if test "$no_cache" != 1; then - echo $wx_cv_use_collpane >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11239,7 +11688,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-colourpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-colourpicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-colourpicker was given. if test "${enable_colourpicker+set}" = set; then enableval=$enable_colourpicker; @@ -11248,14 +11696,16 @@ if test "${enable_colourpicker+set}" = set; then else wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}" @@ -11264,8 +11714,8 @@ fi eval "$wx_cv_use_colourpicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_colourpicker >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11294,7 +11744,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-combobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-combobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-combobox was given. if test "${enable_combobox+set}" = set; then enableval=$enable_combobox; @@ -11303,14 +11752,16 @@ if test "${enable_combobox+set}" = set; then else wx_cv_use_combobox='wxUSE_COMBOBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}" @@ -11319,8 +11770,8 @@ fi eval "$wx_cv_use_combobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_combobox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11349,7 +11800,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-comboctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-comboctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-comboctrl was given. if test "${enable_comboctrl+set}" = set; then enableval=$enable_comboctrl; @@ -11358,14 +11808,16 @@ if test "${enable_comboctrl+set}" = set; then else wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}" @@ -11374,8 +11826,8 @@ fi eval "$wx_cv_use_comboctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_comboctrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11404,7 +11856,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datepick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-datepick was given. if test "${enable_datepick+set}" = set; then enableval=$enable_datepick; @@ -11413,14 +11864,16 @@ if test "${enable_datepick+set}" = set; then else wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}" @@ -11429,8 +11882,8 @@ fi eval "$wx_cv_use_datepick" - if test "$no_cache" != 1; then - echo $wx_cv_use_datepick >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11459,7 +11912,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dirpicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dirpicker was given. if test "${enable_dirpicker+set}" = set; then enableval=$enable_dirpicker; @@ -11468,14 +11920,16 @@ if test "${enable_dirpicker+set}" = set; then else wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}" @@ -11484,8 +11938,8 @@ fi eval "$wx_cv_use_dirpicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_dirpicker >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11514,7 +11968,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-display" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-display... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-display was given. if test "${enable_display+set}" = set; then enableval=$enable_display; @@ -11523,14 +11976,16 @@ if test "${enable_display+set}" = set; then else wx_cv_use_display='wxUSE_DISPLAY=no' fi + cache=yes else LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}" @@ -11539,8 +11994,8 @@ fi eval "$wx_cv_use_display" - if test "$no_cache" != 1; then - echo $wx_cv_use_display >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11569,7 +12024,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-detect_sm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-detect_sm was given. if test "${enable_detect_sm+set}" = set; then enableval=$enable_detect_sm; @@ -11578,14 +12032,16 @@ if test "${enable_detect_sm+set}" = set; then else wx_cv_use_detect_sm='wxUSE_DETECT_SM=no' fi + cache=yes else LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}" @@ -11594,8 +12050,8 @@ fi eval "$wx_cv_use_detect_sm" - if test "$no_cache" != 1; then - echo $wx_cv_use_detect_sm >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11624,7 +12080,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-editablebox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-editablebox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-editablebox was given. if test "${enable_editablebox+set}" = set; then enableval=$enable_editablebox; @@ -11633,14 +12088,16 @@ if test "${enable_editablebox+set}" = set; then else wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}" @@ -11649,8 +12106,8 @@ fi eval "$wx_cv_use_editablebox" - if test "$no_cache" != 1; then - echo $wx_cv_use_editablebox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11679,7 +12136,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-filepicker was given. if test "${enable_filepicker+set}" = set; then enableval=$enable_filepicker; @@ -11688,14 +12144,16 @@ if test "${enable_filepicker+set}" = set; then else wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}" @@ -11704,8 +12162,8 @@ fi eval "$wx_cv_use_filepicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_filepicker >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11722,6 +12180,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}-filectrl" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-filectrl... $ECHO_C" >&6; } + # Check whether --enable-filectrl was given. +if test "${enable_filectrl+set}" = set; then + enableval=$enable_filectrl; + if test "$enableval" = yes; then + wx_cv_use_filectrl='wxUSE_FILECTRL=yes' + else + wx_cv_use_filectrl='wxUSE_FILECTRL=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_FILECTRL=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_filectrl" + if test "x$cache" = xyes; then + echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FILECTRL = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_FILECTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11734,7 +12248,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontpicker" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontpicker... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fontpicker was given. if test "${enable_fontpicker+set}" = set; then enableval=$enable_fontpicker; @@ -11743,14 +12256,16 @@ if test "${enable_fontpicker+set}" = set; then else wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}" @@ -11759,8 +12274,8 @@ fi eval "$wx_cv_use_fontpicker" - if test "$no_cache" != 1; then - echo $wx_cv_use_fontpicker >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11789,7 +12304,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gauge" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gauge... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gauge was given. if test "${enable_gauge+set}" = set; then enableval=$enable_gauge; @@ -11798,14 +12312,16 @@ if test "${enable_gauge+set}" = set; then else wx_cv_use_gauge='wxUSE_GAUGE=no' fi + cache=yes else LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}" @@ -11814,8 +12330,8 @@ fi eval "$wx_cv_use_gauge" - if test "$no_cache" != 1; then - echo $wx_cv_use_gauge >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11844,7 +12360,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-grid" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-grid... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-grid was given. if test "${enable_grid+set}" = set; then enableval=$enable_grid; @@ -11853,14 +12368,16 @@ if test "${enable_grid+set}" = set; then else wx_cv_use_grid='wxUSE_GRID=no' fi + cache=yes else LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}" @@ -11869,8 +12386,8 @@ fi eval "$wx_cv_use_grid" - if test "$no_cache" != 1; then - echo $wx_cv_use_grid >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11899,7 +12416,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dataviewctrl was given. if test "${enable_dataviewctrl+set}" = set; then enableval=$enable_dataviewctrl; @@ -11908,14 +12424,16 @@ if test "${enable_dataviewctrl+set}" = set; then else wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}" @@ -11924,8 +12442,8 @@ fi eval "$wx_cv_use_dataviewctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_dataviewctrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -11954,7 +12472,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-hyperlink" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-hyperlink... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-hyperlink was given. if test "${enable_hyperlink+set}" = set; then enableval=$enable_hyperlink; @@ -11963,14 +12480,16 @@ if test "${enable_hyperlink+set}" = set; then else wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}" @@ -11979,8 +12498,8 @@ fi eval "$wx_cv_use_hyperlink" - if test "$no_cache" != 1; then - echo $wx_cv_use_hyperlink >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12009,7 +12528,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-imaglist" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-imaglist... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-imaglist was given. if test "${enable_imaglist+set}" = set; then enableval=$enable_imaglist; @@ -12018,14 +12536,16 @@ if test "${enable_imaglist+set}" = set; then else wx_cv_use_imaglist='wxUSE_IMAGLIST=no' fi + cache=yes else LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}" @@ -12034,8 +12554,8 @@ fi eval "$wx_cv_use_imaglist" - if test "$no_cache" != 1; then - echo $wx_cv_use_imaglist >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12064,7 +12584,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listbook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-listbook was given. if test "${enable_listbook+set}" = set; then enableval=$enable_listbook; @@ -12073,14 +12592,16 @@ if test "${enable_listbook+set}" = set; then else wx_cv_use_listbook='wxUSE_LISTBOOK=no' fi + cache=yes else LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}" @@ -12089,8 +12610,8 @@ fi eval "$wx_cv_use_listbook" - if test "$no_cache" != 1; then - echo $wx_cv_use_listbook >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12119,7 +12640,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listbox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-listbox was given. if test "${enable_listbox+set}" = set; then enableval=$enable_listbox; @@ -12128,14 +12648,16 @@ if test "${enable_listbox+set}" = set; then else wx_cv_use_listbox='wxUSE_LISTBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}" @@ -12144,8 +12666,8 @@ fi eval "$wx_cv_use_listbox" - if test "$no_cache" != 1; then - echo $wx_cv_use_listbox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12174,7 +12696,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-listctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-listctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-listctrl was given. if test "${enable_listctrl+set}" = set; then enableval=$enable_listctrl; @@ -12183,14 +12704,16 @@ if test "${enable_listctrl+set}" = set; then else wx_cv_use_listctrl='wxUSE_LISTCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}" @@ -12199,8 +12722,8 @@ fi eval "$wx_cv_use_listctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_listctrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12229,7 +12752,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-notebook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-notebook was given. if test "${enable_notebook+set}" = set; then enableval=$enable_notebook; @@ -12238,14 +12760,16 @@ if test "${enable_notebook+set}" = set; then else wx_cv_use_notebook='wxUSE_NOTEBOOK=no' fi + cache=yes else LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}" @@ -12254,8 +12778,8 @@ fi eval "$wx_cv_use_notebook" - if test "$no_cache" != 1; then - echo $wx_cv_use_notebook >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12284,7 +12808,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-odcombobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-odcombobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-odcombobox was given. if test "${enable_odcombobox+set}" = set; then enableval=$enable_odcombobox; @@ -12293,14 +12816,16 @@ if test "${enable_odcombobox+set}" = set; then else wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}" @@ -12309,8 +12834,8 @@ fi eval "$wx_cv_use_odcombobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_odcombobox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12339,7 +12864,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-radiobox was given. if test "${enable_radiobox+set}" = set; then enableval=$enable_radiobox; @@ -12348,14 +12872,16 @@ if test "${enable_radiobox+set}" = set; then else wx_cv_use_radiobox='wxUSE_RADIOBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}" @@ -12364,8 +12890,8 @@ fi eval "$wx_cv_use_radiobox" - if test "$no_cache" != 1; then - echo $wx_cv_use_radiobox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12394,7 +12920,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-radiobtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-radiobtn... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-radiobtn was given. if test "${enable_radiobtn+set}" = set; then enableval=$enable_radiobtn; @@ -12403,14 +12928,16 @@ if test "${enable_radiobtn+set}" = set; then else wx_cv_use_radiobtn='wxUSE_RADIOBTN=no' fi + cache=yes else LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}" @@ -12419,8 +12946,8 @@ fi eval "$wx_cv_use_radiobtn" - if test "$no_cache" != 1; then - echo $wx_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12449,7 +12976,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sash" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-sash... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-sash was given. if test "${enable_sash+set}" = set; then enableval=$enable_sash; @@ -12458,14 +12984,16 @@ if test "${enable_sash+set}" = set; then else wx_cv_use_sash='wxUSE_SASH=no' fi + cache=yes else LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}" @@ -12474,8 +13002,8 @@ fi eval "$wx_cv_use_sash" - if test "$no_cache" != 1; then - echo $wx_cv_use_sash >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12504,7 +13032,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-scrollbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-scrollbar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-scrollbar was given. if test "${enable_scrollbar+set}" = set; then enableval=$enable_scrollbar; @@ -12513,14 +13040,16 @@ if test "${enable_scrollbar+set}" = set; then else wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no' fi + cache=yes else LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}" @@ -12529,8 +13058,8 @@ fi eval "$wx_cv_use_scrollbar" - if test "$no_cache" != 1; then - echo $wx_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12559,7 +13088,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-searchctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-searchctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-searchctrl was given. if test "${enable_searchctrl+set}" = set; then enableval=$enable_searchctrl; @@ -12568,14 +13096,16 @@ if test "${enable_searchctrl+set}" = set; then else wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}" @@ -12584,8 +13114,8 @@ fi eval "$wx_cv_use_searchctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_searchctrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12614,7 +13144,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-slider" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-slider... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-slider was given. if test "${enable_slider+set}" = set; then enableval=$enable_slider; @@ -12623,14 +13152,16 @@ if test "${enable_slider+set}" = set; then else wx_cv_use_slider='wxUSE_SLIDER=no' fi + cache=yes else LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}" @@ -12639,8 +13170,8 @@ fi eval "$wx_cv_use_slider" - if test "$no_cache" != 1; then - echo $wx_cv_use_slider >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12669,7 +13200,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinbtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-spinbtn... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-spinbtn was given. if test "${enable_spinbtn+set}" = set; then enableval=$enable_spinbtn; @@ -12678,14 +13208,16 @@ if test "${enable_spinbtn+set}" = set; then else wx_cv_use_spinbtn='wxUSE_SPINBTN=no' fi + cache=yes else LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}" @@ -12694,8 +13226,8 @@ fi eval "$wx_cv_use_spinbtn" - if test "$no_cache" != 1; then - echo $wx_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12724,7 +13256,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-spinctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-spinctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-spinctrl was given. if test "${enable_spinctrl+set}" = set; then enableval=$enable_spinctrl; @@ -12733,14 +13264,16 @@ if test "${enable_spinctrl+set}" = set; then else wx_cv_use_spinctrl='wxUSE_SPINCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}" @@ -12749,8 +13282,8 @@ fi eval "$wx_cv_use_spinctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12779,7 +13312,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splitter" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splitter... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-splitter was given. if test "${enable_splitter+set}" = set; then enableval=$enable_splitter; @@ -12788,14 +13320,16 @@ if test "${enable_splitter+set}" = set; then else wx_cv_use_splitter='wxUSE_SPLITTER=no' fi + cache=yes else LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}" @@ -12804,8 +13338,8 @@ fi eval "$wx_cv_use_splitter" - if test "$no_cache" != 1; then - echo $wx_cv_use_splitter >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12834,7 +13368,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbmp" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statbmp... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statbmp was given. if test "${enable_statbmp+set}" = set; then enableval=$enable_statbmp; @@ -12843,14 +13376,16 @@ if test "${enable_statbmp+set}" = set; then else wx_cv_use_statbmp='wxUSE_STATBMP=no' fi + cache=yes else LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}" @@ -12859,8 +13394,8 @@ fi eval "$wx_cv_use_statbmp" - if test "$no_cache" != 1; then - echo $wx_cv_use_statbmp >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12889,7 +13424,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statbox" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statbox... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statbox was given. if test "${enable_statbox+set}" = set; then enableval=$enable_statbox; @@ -12898,14 +13432,16 @@ if test "${enable_statbox+set}" = set; then else wx_cv_use_statbox='wxUSE_STATBOX=no' fi + cache=yes else LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}" @@ -12914,8 +13450,8 @@ fi eval "$wx_cv_use_statbox" - if test "$no_cache" != 1; then - echo $wx_cv_use_statbox >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12944,7 +13480,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statline" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statline... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statline was given. if test "${enable_statline+set}" = set; then enableval=$enable_statline; @@ -12953,14 +13488,16 @@ if test "${enable_statline+set}" = set; then else wx_cv_use_statline='wxUSE_STATLINE=no' fi + cache=yes else LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}" @@ -12969,8 +13506,8 @@ fi eval "$wx_cv_use_statline" - if test "$no_cache" != 1; then - echo $wx_cv_use_statline >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -12999,7 +13536,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stattext" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-stattext... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-stattext was given. if test "${enable_stattext+set}" = set; then enableval=$enable_stattext; @@ -13008,14 +13544,16 @@ if test "${enable_stattext+set}" = set; then else wx_cv_use_stattext='wxUSE_STATTEXT=no' fi + cache=yes else LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}" @@ -13024,8 +13562,8 @@ fi eval "$wx_cv_use_stattext" - if test "$no_cache" != 1; then - echo $wx_cv_use_stattext >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13054,7 +13592,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-statusbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-statusbar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-statusbar was given. if test "${enable_statusbar+set}" = set; then enableval=$enable_statusbar; @@ -13063,14 +13600,16 @@ if test "${enable_statusbar+set}" = set; then else wx_cv_use_statusbar='wxUSE_STATUSBAR=no' fi + cache=yes else LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}" @@ -13079,8 +13618,8 @@ fi eval "$wx_cv_use_statusbar" - if test "$no_cache" != 1; then - echo $wx_cv_use_statusbar >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13109,7 +13648,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tabdialog" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tabdialog was given. if test "${enable_tabdialog+set}" = set; then enableval=$enable_tabdialog; @@ -13118,14 +13656,16 @@ if test "${enable_tabdialog+set}" = set; then else wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no' fi + cache=yes else LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}" @@ -13134,8 +13674,8 @@ fi eval "$wx_cv_use_tabdialog" - if test "$no_cache" != 1; then - echo $wx_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13152,6 +13692,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}-taskbaricon" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-taskbaricon... $ECHO_C" >&6; } + # Check whether --enable-taskbaricon was given. +if test "${enable_taskbaricon+set}" = set; then + enableval=$enable_taskbaricon; + if test "$enableval" = yes; then + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=yes' + else + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}" + +fi + + + eval "$wx_cv_use_taskbaricon" + if test "x$cache" = xyes; then + echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TASKBARICON = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_TASKBARICON + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -13164,7 +13760,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textctrl was given. if test "${enable_textctrl+set}" = set; then enableval=$enable_textctrl; @@ -13173,14 +13768,16 @@ if test "${enable_textctrl+set}" = set; then else wx_cv_use_textctrl='wxUSE_TEXTCTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}" @@ -13189,8 +13786,8 @@ fi eval "$wx_cv_use_textctrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_textctrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13219,7 +13816,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-togglebtn was given. if test "${enable_togglebtn+set}" = set; then enableval=$enable_togglebtn; @@ -13228,14 +13824,16 @@ if test "${enable_togglebtn+set}" = set; then else wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no' fi + cache=yes else LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}" @@ -13244,8 +13842,8 @@ fi eval "$wx_cv_use_togglebtn" - if test "$no_cache" != 1; then - echo $wx_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13274,7 +13872,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-toolbar was given. if test "${enable_toolbar+set}" = set; then enableval=$enable_toolbar; @@ -13283,14 +13880,16 @@ if test "${enable_toolbar+set}" = set; then else wx_cv_use_toolbar='wxUSE_TOOLBAR=no' fi + cache=yes else LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}" @@ -13299,8 +13898,8 @@ fi eval "$wx_cv_use_toolbar" - if test "$no_cache" != 1; then - echo $wx_cv_use_toolbar >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13329,7 +13928,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tbarnative was given. if test "${enable_tbarnative+set}" = set; then enableval=$enable_tbarnative; @@ -13338,14 +13936,16 @@ if test "${enable_tbarnative+set}" = set; then else wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no' fi + cache=yes else LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}" @@ -13354,8 +13954,8 @@ fi eval "$wx_cv_use_tbarnative" - if test "$no_cache" != 1; then - echo $wx_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13384,7 +13984,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-treebook was given. if test "${enable_treebook+set}" = set; then enableval=$enable_treebook; @@ -13393,14 +13992,16 @@ if test "${enable_treebook+set}" = set; then else wx_cv_use_treebook='wxUSE_TREEBOOK=no' fi + cache=yes else LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}" @@ -13409,8 +14010,8 @@ fi eval "$wx_cv_use_treebook" - if test "$no_cache" != 1; then - echo $wx_cv_use_treebook >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13439,7 +14040,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbook" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-toolbook... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-toolbook was given. if test "${enable_toolbook+set}" = set; then enableval=$enable_toolbook; @@ -13448,14 +14048,16 @@ if test "${enable_toolbook+set}" = set; then else wx_cv_use_toolbook='wxUSE_TOOLBOOK=no' fi + cache=yes else LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}" @@ -13464,8 +14066,8 @@ fi eval "$wx_cv_use_toolbook" - if test "$no_cache" != 1; then - echo $wx_cv_use_toolbook >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13494,7 +14096,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-treectrl was given. if test "${enable_treectrl+set}" = set; then enableval=$enable_treectrl; @@ -13503,14 +14104,16 @@ if test "${enable_treectrl+set}" = set; then else wx_cv_use_treectrl='wxUSE_TREECTRL=no' fi + cache=yes else LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}" @@ -13519,8 +14122,8 @@ fi eval "$wx_cv_use_treectrl" - if test "$no_cache" != 1; then - echo $wx_cv_use_treectrl >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13549,7 +14152,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tipwindow was given. if test "${enable_tipwindow+set}" = set; then enableval=$enable_tipwindow; @@ -13558,14 +14160,16 @@ if test "${enable_tipwindow+set}" = set; then else wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no' fi + cache=yes else LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}" @@ -13574,8 +14178,8 @@ fi eval "$wx_cv_use_tipwindow" - if test "$no_cache" != 1; then - echo $wx_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13604,7 +14208,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-popupwin was given. if test "${enable_popupwin+set}" = set; then enableval=$enable_popupwin; @@ -13613,14 +14216,16 @@ if test "${enable_popupwin+set}" = set; then else wx_cv_use_popupwin='wxUSE_POPUPWIN=no' fi + cache=yes else LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}" @@ -13629,8 +14234,8 @@ fi eval "$wx_cv_use_popupwin" - if test "$no_cache" != 1; then - echo $wx_cv_use_popupwin >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13661,7 +14266,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commondlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-commondlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-commondlg was given. if test "${enable_commondlg+set}" = set; then enableval=$enable_commondlg; @@ -13670,14 +14274,16 @@ if test "${enable_commondlg+set}" = set; then else wx_cv_use_commondlg='wxUSE_COMMONDLGS=no' fi + cache=yes else LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}" @@ -13686,8 +14292,8 @@ fi eval "$wx_cv_use_commondlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_commondlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13716,7 +14322,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-aboutdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-aboutdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-aboutdlg was given. if test "${enable_aboutdlg+set}" = set; then enableval=$enable_aboutdlg; @@ -13725,14 +14330,16 @@ if test "${enable_aboutdlg+set}" = set; then else wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}" @@ -13741,8 +14348,8 @@ fi eval "$wx_cv_use_aboutdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_aboutdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13771,7 +14378,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-choicedlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-choicedlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-choicedlg was given. if test "${enable_choicedlg+set}" = set; then enableval=$enable_choicedlg; @@ -13780,14 +14386,16 @@ if test "${enable_choicedlg+set}" = set; then else wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}" @@ -13796,8 +14404,8 @@ fi eval "$wx_cv_use_choicedlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13826,7 +14434,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-coldlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-coldlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-coldlg was given. if test "${enable_coldlg+set}" = set; then enableval=$enable_coldlg; @@ -13835,14 +14442,16 @@ if test "${enable_coldlg+set}" = set; then else wx_cv_use_coldlg='wxUSE_COLOURDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}" @@ -13851,8 +14460,8 @@ fi eval "$wx_cv_use_coldlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_coldlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13881,7 +14490,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filedlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-filedlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-filedlg was given. if test "${enable_filedlg+set}" = set; then enableval=$enable_filedlg; @@ -13890,14 +14498,16 @@ if test "${enable_filedlg+set}" = set; then else wx_cv_use_filedlg='wxUSE_FILEDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}" @@ -13906,8 +14516,8 @@ fi eval "$wx_cv_use_filedlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_filedlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13936,7 +14546,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-finddlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-finddlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-finddlg was given. if test "${enable_finddlg+set}" = set; then enableval=$enable_finddlg; @@ -13945,14 +14554,16 @@ if test "${enable_finddlg+set}" = set; then else wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}" @@ -13961,8 +14572,8 @@ fi eval "$wx_cv_use_finddlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_finddlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -13991,7 +14602,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-fontdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-fontdlg was given. if test "${enable_fontdlg+set}" = set; then enableval=$enable_fontdlg; @@ -14000,14 +14610,16 @@ if test "${enable_fontdlg+set}" = set; then else wx_cv_use_fontdlg='wxUSE_FONTDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}" @@ -14016,8 +14628,8 @@ fi eval "$wx_cv_use_fontdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14046,7 +14658,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dirdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dirdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dirdlg was given. if test "${enable_dirdlg+set}" = set; then enableval=$enable_dirdlg; @@ -14055,14 +14666,16 @@ if test "${enable_dirdlg+set}" = set; then else wx_cv_use_dirdlg='wxUSE_DIRDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}" @@ -14071,8 +14684,8 @@ fi eval "$wx_cv_use_dirdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14101,7 +14714,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-msgdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-msgdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-msgdlg was given. if test "${enable_msgdlg+set}" = set; then enableval=$enable_msgdlg; @@ -14110,14 +14722,16 @@ if test "${enable_msgdlg+set}" = set; then else wx_cv_use_msgdlg='wxUSE_MSGDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}" @@ -14126,8 +14740,8 @@ fi eval "$wx_cv_use_msgdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14156,7 +14770,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-numberdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-numberdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-numberdlg was given. if test "${enable_numberdlg+set}" = set; then enableval=$enable_numberdlg; @@ -14165,14 +14778,16 @@ if test "${enable_numberdlg+set}" = set; then else wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}" @@ -14181,8 +14796,8 @@ fi eval "$wx_cv_use_numberdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14211,7 +14826,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splash" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splash... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-splash was given. if test "${enable_splash+set}" = set; then enableval=$enable_splash; @@ -14220,14 +14834,16 @@ if test "${enable_splash+set}" = set; then else wx_cv_use_splash='wxUSE_SPLASH=no' fi + cache=yes else LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}" @@ -14236,8 +14852,8 @@ fi eval "$wx_cv_use_splash" - if test "$no_cache" != 1; then - echo $wx_cv_use_splash >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14266,7 +14882,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-textdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-textdlg was given. if test "${enable_textdlg+set}" = set; then enableval=$enable_textdlg; @@ -14275,14 +14890,16 @@ if test "${enable_textdlg+set}" = set; then else wx_cv_use_textdlg='wxUSE_TEXTDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}" @@ -14291,8 +14908,8 @@ fi eval "$wx_cv_use_textdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_textdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14321,7 +14938,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tipdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tipdlg was given. if test "${enable_tipdlg+set}" = set; then enableval=$enable_tipdlg; @@ -14330,14 +14946,16 @@ if test "${enable_tipdlg+set}" = set; then else wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no' fi + cache=yes else LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}" @@ -14346,8 +14964,8 @@ fi eval "$wx_cv_use_tipdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14376,7 +14994,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-progressdlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-progressdlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-progressdlg was given. if test "${enable_progressdlg+set}" = set; then enableval=$enable_progressdlg; @@ -14385,14 +15002,16 @@ if test "${enable_progressdlg+set}" = set; then else wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}" @@ -14401,8 +15020,8 @@ fi eval "$wx_cv_use_progressdlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14431,7 +15050,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wizarddlg" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-wizarddlg... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-wizarddlg was given. if test "${enable_wizarddlg+set}" = set; then enableval=$enable_wizarddlg; @@ -14440,14 +15058,16 @@ if test "${enable_wizarddlg+set}" = set; then else wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no' fi + cache=yes else LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}" @@ -14456,8 +15076,8 @@ fi eval "$wx_cv_use_wizarddlg" - if test "$no_cache" != 1; then - echo $wx_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14488,7 +15108,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-menus" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-menus... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-menus was given. if test "${enable_menus+set}" = set; then enableval=$enable_menus; @@ -14497,14 +15116,16 @@ if test "${enable_menus+set}" = set; then else wx_cv_use_menus='wxUSE_MENUS=no' fi + cache=yes else LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}" @@ -14513,8 +15134,8 @@ fi eval "$wx_cv_use_menus" - if test "$no_cache" != 1; then - echo $wx_cv_use_menus >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14543,7 +15164,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-miniframe" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-miniframe... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-miniframe was given. if test "${enable_miniframe+set}" = set; then enableval=$enable_miniframe; @@ -14552,14 +15172,16 @@ if test "${enable_miniframe+set}" = set; then else wx_cv_use_miniframe='wxUSE_MINIFRAME=no' fi + cache=yes else LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}" @@ -14568,8 +15190,8 @@ fi eval "$wx_cv_use_miniframe" - if test "$no_cache" != 1; then - echo $wx_cv_use_miniframe >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14598,7 +15220,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tooltips" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tooltips... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tooltips was given. if test "${enable_tooltips+set}" = set; then enableval=$enable_tooltips; @@ -14607,14 +15228,16 @@ if test "${enable_tooltips+set}" = set; then else wx_cv_use_tooltips='wxUSE_TOOLTIPS=no' fi + cache=yes else LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}" @@ -14623,8 +15246,8 @@ fi eval "$wx_cv_use_tooltips" - if test "$no_cache" != 1; then - echo $wx_cv_use_tooltips >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14653,7 +15276,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-splines" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-splines... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-splines was given. if test "${enable_splines+set}" = set; then enableval=$enable_splines; @@ -14662,14 +15284,16 @@ if test "${enable_splines+set}" = set; then else wx_cv_use_splines='wxUSE_SPLINES=no' fi + cache=yes else LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}" @@ -14678,8 +15302,8 @@ fi eval "$wx_cv_use_splines" - if test "$no_cache" != 1; then - echo $wx_cv_use_splines >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14708,7 +15332,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mousewheel" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-mousewheel... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-mousewheel was given. if test "${enable_mousewheel+set}" = set; then enableval=$enable_mousewheel; @@ -14717,14 +15340,16 @@ if test "${enable_mousewheel+set}" = set; then else wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no' fi + cache=yes else LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}" @@ -14733,8 +15358,8 @@ fi eval "$wx_cv_use_mousewheel" - if test "$no_cache" != 1; then - echo $wx_cv_use_mousewheel >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14763,7 +15388,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-validators" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-validators... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-validators was given. if test "${enable_validators+set}" = set; then enableval=$enable_validators; @@ -14772,14 +15396,16 @@ if test "${enable_validators+set}" = set; then else wx_cv_use_validators='wxUSE_VALIDATORS=no' fi + cache=yes else LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}" @@ -14788,8 +15414,8 @@ fi eval "$wx_cv_use_validators" - if test "$no_cache" != 1; then - echo $wx_cv_use_validators >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14818,7 +15444,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-busyinfo" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-busyinfo... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-busyinfo was given. if test "${enable_busyinfo+set}" = set; then enableval=$enable_busyinfo; @@ -14827,14 +15452,16 @@ if test "${enable_busyinfo+set}" = set; then else wx_cv_use_busyinfo='wxUSE_BUSYINFO=no' fi + cache=yes else LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}" @@ -14843,8 +15470,8 @@ fi eval "$wx_cv_use_busyinfo" - if test "$no_cache" != 1; then - echo $wx_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14873,7 +15500,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-joystick" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-joystick... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-joystick was given. if test "${enable_joystick+set}" = set; then enableval=$enable_joystick; @@ -14882,14 +15508,16 @@ if test "${enable_joystick+set}" = set; then else wx_cv_use_joystick='wxUSE_JOYSTICK=no' fi + cache=yes else LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}" @@ -14898,8 +15526,8 @@ fi eval "$wx_cv_use_joystick" - if test "$no_cache" != 1; then - echo $wx_cv_use_joystick >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14928,7 +15556,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-metafile" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-metafile was given. if test "${enable_metafile+set}" = set; then enableval=$enable_metafile; @@ -14937,14 +15564,16 @@ if test "${enable_metafile+set}" = set; then else wx_cv_use_metafile='wxUSE_METAFILE=no' fi + cache=yes else LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" @@ -14953,8 +15582,8 @@ fi eval "$wx_cv_use_metafile" - if test "$no_cache" != 1; then - echo $wx_cv_use_metafile >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -14983,7 +15612,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dragimage" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-dragimage... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-dragimage was given. if test "${enable_dragimage+set}" = set; then enableval=$enable_dragimage; @@ -14992,14 +15620,16 @@ if test "${enable_dragimage+set}" = set; then else wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no' fi + cache=yes else LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}" @@ -15008,8 +15638,8 @@ fi eval "$wx_cv_use_dragimage" - if test "$no_cache" != 1; then - echo $wx_cv_use_dragimage >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15038,7 +15668,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-accessibility" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-accessibility... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-accessibility was given. if test "${enable_accessibility+set}" = set; then enableval=$enable_accessibility; @@ -15047,14 +15676,16 @@ if test "${enable_accessibility+set}" = set; then else wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no' fi + cache=yes else LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}" @@ -15063,8 +15694,8 @@ fi eval "$wx_cv_use_accessibility" - if test "$no_cache" != 1; then - echo $wx_cv_use_accessibility >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15081,64 +15712,6 @@ fi echo "${ECHO_T}$result" >&6; } -if test "$wxUSE_MSW" = "1"; then - - enablestring= - defaultval=$wxUSE_ALL_FEATURES - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dccache" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; } - no_cache=0 - # Check whether --enable-dccache was given. -if test "${enable_dccache+set}" = set; then - enableval=$enable_dccache; - if test "$enableval" = yes; then - wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' - else - wx_cv_use_dccache='wxUSE_DC_CACHEING=no' - fi - -else - - LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` - if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" - else - no_cache=1 - fi - - wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" - -fi - - - eval "$wx_cv_use_dccache" - if test "$no_cache" != 1; then - echo $wx_cv_use_dccache >> ${wx_arg_cache_file}.tmp - fi - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DC_CACHEING = yes; then - result=no - else - result=yes - fi - else - result=$wxUSE_DC_CACHEING - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - -fi - enablestring= @@ -15153,7 +15726,6 @@ fi { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-palette" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-palette... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-palette was given. if test "${enable_palette+set}" = set; then enableval=$enable_palette; @@ -15162,14 +15734,16 @@ if test "${enable_palette+set}" = set; then else wx_cv_use_palette='wxUSE_PALETTE=no' fi + cache=yes else LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}" @@ -15178,8 +15752,8 @@ fi eval "$wx_cv_use_palette" - if test "$no_cache" != 1; then - echo $wx_cv_use_palette >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15208,7 +15782,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-image" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-image... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-image was given. if test "${enable_image+set}" = set; then enableval=$enable_image; @@ -15217,14 +15790,16 @@ if test "${enable_image+set}" = set; then else wx_cv_use_image='wxUSE_IMAGE=no' fi + cache=yes else LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}" @@ -15233,8 +15808,8 @@ fi eval "$wx_cv_use_image" - if test "$no_cache" != 1; then - echo $wx_cv_use_image >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15263,7 +15838,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gif" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-gif... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-gif was given. if test "${enable_gif+set}" = set; then enableval=$enable_gif; @@ -15272,14 +15846,16 @@ if test "${enable_gif+set}" = set; then else wx_cv_use_gif='wxUSE_GIF=no' fi + cache=yes else LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}" @@ -15288,8 +15864,8 @@ fi eval "$wx_cv_use_gif" - if test "$no_cache" != 1; then - echo $wx_cv_use_gif >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15318,7 +15894,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pcx" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-pcx... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-pcx was given. if test "${enable_pcx+set}" = set; then enableval=$enable_pcx; @@ -15327,14 +15902,16 @@ if test "${enable_pcx+set}" = set; then else wx_cv_use_pcx='wxUSE_PCX=no' fi + cache=yes else LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}" @@ -15343,8 +15920,8 @@ fi eval "$wx_cv_use_pcx" - if test "$no_cache" != 1; then - echo $wx_cv_use_pcx >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15373,7 +15950,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tga" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-tga... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-tga was given. if test "${enable_tga+set}" = set; then enableval=$enable_tga; @@ -15382,14 +15958,16 @@ if test "${enable_tga+set}" = set; then else wx_cv_use_tga='wxUSE_TGA=no' fi + cache=yes else LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}" @@ -15398,8 +15976,8 @@ fi eval "$wx_cv_use_tga" - if test "$no_cache" != 1; then - echo $wx_cv_use_tga >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15428,7 +16006,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-iff" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-iff... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-iff was given. if test "${enable_iff+set}" = set; then enableval=$enable_iff; @@ -15437,14 +16014,16 @@ if test "${enable_iff+set}" = set; then else wx_cv_use_iff='wxUSE_IFF=no' fi + cache=yes else LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}" @@ -15453,8 +16032,8 @@ fi eval "$wx_cv_use_iff" - if test "$no_cache" != 1; then - echo $wx_cv_use_iff >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15483,7 +16062,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-pnm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-pnm... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-pnm was given. if test "${enable_pnm+set}" = set; then enableval=$enable_pnm; @@ -15492,14 +16070,16 @@ if test "${enable_pnm+set}" = set; then else wx_cv_use_pnm='wxUSE_PNM=no' fi + cache=yes else LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}" @@ -15508,8 +16088,8 @@ fi eval "$wx_cv_use_pnm" - if test "$no_cache" != 1; then - echo $wx_cv_use_pnm >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15538,7 +16118,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xpm" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-xpm... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-xpm was given. if test "${enable_xpm+set}" = set; then enableval=$enable_xpm; @@ -15547,14 +16126,16 @@ if test "${enable_xpm+set}" = set; then else wx_cv_use_xpm='wxUSE_XPM=no' fi + cache=yes else LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}" @@ -15563,8 +16144,8 @@ fi eval "$wx_cv_use_xpm" - if test "$no_cache" != 1; then - echo $wx_cv_use_xpm >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15593,7 +16174,6 @@ echo "${ECHO_T}$result" >&6; } { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ico_cur" >&5 echo $ECHO_N "checking for --${enablestring:-enable}-ico_cur... $ECHO_C" >&6; } - no_cache=0 # Check whether --enable-ico_cur was given. if test "${enable_ico_cur+set}" = set; then enableval=$enable_ico_cur; @@ -15602,14 +16182,16 @@ if test "${enable_ico_cur+set}" = set; then else wx_cv_use_ico_cur='wxUSE_ICO_CUR=no' fi + cache=yes else LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}` if test "x$LINE" != x ; then - eval "DEFAULT_$LINE" + eval "DEFAULT_$LINE" + cache=yes else - no_cache=1 + cache=no fi wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}" @@ -15618,8 +16200,8 @@ fi eval "$wx_cv_use_ico_cur" - if test "$no_cache" != 1; then - echo $wx_cv_use_ico_cur >> ${wx_arg_cache_file}.tmp + if test "x$cache" = xyes; then + echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp fi if test x"$enablestring" = xdisable; then @@ -15636,6 +16218,288 @@ 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}-dccache" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-dccache... $ECHO_C" >&6; } + # Check whether --enable-dccache was given. +if test "${enable_dccache+set}" = set; then + enableval=$enable_dccache; + if test "$enableval" = yes; then + wx_cv_use_dccache='wxUSE_DC_CACHEING=yes' + else + wx_cv_use_dccache='wxUSE_DC_CACHEING=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_DC_CACHEING=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_dccache='wxUSE_DC_CACHEING=${'DEFAULT_wxUSE_DC_CACHEING":-$defaultval}" + +fi + + + eval "$wx_cv_use_dccache" + if test "x$cache" = xyes; then + echo "wxUSE_DC_CACHEING=$wxUSE_DC_CACHEING" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DC_CACHEING = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DC_CACHEING + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ps-in-msw" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ps-in-msw... $ECHO_C" >&6; } + # Check whether --enable-ps-in-msw was given. +if test "${enable_ps_in_msw+set}" = set; then + enableval=$enable_ps_in_msw; + if test "$enableval" = yes; then + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=yes' + else + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_ps_in_msw='wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=${'DEFAULT_wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW":-$defaultval}" + +fi + + + eval "$wx_cv_use_ps_in_msw" + if test "x$cache" = xyes; then + echo "wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ownerdrawn" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-ownerdrawn... $ECHO_C" >&6; } + # Check whether --enable-ownerdrawn was given. +if test "${enable_ownerdrawn+set}" = set; then + enableval=$enable_ownerdrawn; + if test "$enableval" = yes; then + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=yes' + else + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_OWNER_DRAWN=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_ownerdrawn='wxUSE_OWNER_DRAWN=${'DEFAULT_wxUSE_OWNER_DRAWN":-$defaultval}" + +fi + + + eval "$wx_cv_use_ownerdrawn" + if test "x$cache" = xyes; then + echo "wxUSE_OWNER_DRAWN=$wxUSE_OWNER_DRAWN" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_OWNER_DRAWN = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_OWNER_DRAWN + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-uxtheme" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-uxtheme... $ECHO_C" >&6; } + # Check whether --enable-uxtheme was given. +if test "${enable_uxtheme+set}" = set; then + enableval=$enable_uxtheme; + if test "$enableval" = yes; then + wx_cv_use_uxtheme='wxUSE_UXTHEME=yes' + else + wx_cv_use_uxtheme='wxUSE_UXTHEME=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_UXTHEME=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_uxtheme='wxUSE_UXTHEME=${'DEFAULT_wxUSE_UXTHEME":-$defaultval}" + +fi + + + eval "$wx_cv_use_uxtheme" + if test "x$cache" = xyes; then + echo "wxUSE_UXTHEME=$wxUSE_UXTHEME" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_UXTHEME = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_UXTHEME + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxdib" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-wxdib... $ECHO_C" >&6; } + # Check whether --enable-wxdib was given. +if test "${enable_wxdib+set}" = set; then + enableval=$enable_wxdib; + if test "$enableval" = yes; then + wx_cv_use_wxdib='wxUSE_DIB=yes' + else + wx_cv_use_wxdib='wxUSE_DIB=no' + fi + cache=yes + +else + + LINE=`grep "^wxUSE_DIB=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + cache=yes + else + cache=no + fi + + wx_cv_use_wxdib='wxUSE_DIB=${'DEFAULT_wxUSE_DIB":-$defaultval}" + +fi + + + eval "$wx_cv_use_wxdib" + if test "x$cache" = xyes; then + echo "wxUSE_DIB=$wxUSE_DIB" >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DIB = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_DIB + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + fi @@ -19452,103 +20316,6 @@ echo "$as_me: error: C++ compiler is needed to build wxWidgets" >&2;} { (exit 1); exit 1; }; } fi -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_RANLIB" = x; then - RANLIB=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - RANLIB=$ac_ct_RANLIB - fi -else - RANLIB="$ac_cv_prog_RANLIB" -fi - - if test "x$SUNCXX" != xyes; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. @@ -19653,595 +20420,256 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;} fi fi -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done -IFS=$as_save_IFS - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. Don't cache a - # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi -fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -case ${INSTALL} in - /* ) # Absolute - ;; - ?:* ) # Drive letter, considered as absolute. - ;; - *) - INSTALL=`pwd`/${INSTALL} ;; -esac - - -case "${host}" in +retest_macosx_linking=no - *-*-darwin* ) - INSTALL_PROGRAM="cp -fp" - INSTALL_DATA="cp -fp" - ;; - *) - ;; -esac - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi +#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 -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - if test "x$ac_ct_STRIP" = x; then - STRIP="true" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi +if test "x$wxUSE_MACOSX_SDK" != "x"; then + { echo "$as_me:$LINENO: checking for SDK directory $wxUSE_MACOSX_SDK" >&5 +echo $ECHO_N "checking for SDK directory $wxUSE_MACOSX_SDK... $ECHO_C" >&6; } + if ! test -d "$wxUSE_MACOSX_SDK"; then + { { echo "$as_me:$LINENO: error: not found +See \`config.log' for more details." >&5 +echo "$as_me: error: not found +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + else + { echo "$as_me:$LINENO: result: exists" >&5 +echo "${ECHO_T}exists" >&6; } + fi + MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" + retest_macosx_linking=yes + fi +if test "x$wxUSE_MACOSX_VERSION_MIN" = "xno"; then + wxUSE_MACOSX_VERSION_MIN= +elif test "x$wxUSE_MACOSX_VERSION_MIN" = "xyes"; then + if test "x$wxUSE_MACOSX_SDK" != "x"; then + { echo "$as_me:$LINENO: checking SDK deployment version" >&5 +echo $ECHO_N "checking SDK deployment version... $ECHO_C" >&6; } -if test "$wxUSE_WINE" = "yes"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}wrc", so it can be a program name with args. -set dummy ${ac_tool_prefix}wrc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}wrc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + 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/'` -fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + # If that failed, try again with the new key + if test "x$MACOSX_SDK_PLIST_VERSION_MIN" == "x"; then + MACOSX_SDK_PLIST_VERSION_MIN=`defaults read "$wxUSE_MACOSX_SDK/SDKSettings" DefaultProperties | grep '^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}[^"]*"\{0,1\}; *$' | sed 's/^ *"\{0,1\}MACOSX_DEPLOYMENT_TARGET"\{0,1\} *= *"\{0,1\}\([^"]*\)"\{0,1\} *; *$/\1/'` -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "wrc", so it can be a program name with args. -set dummy wrc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="wrc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + fi -fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + 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$ac_ct_WINDRES" = x; then - WINDRES="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - WINDRES=$ac_ct_WINDRES - fi -else - WINDRES="$ac_cv_prog_WINDRES" -fi - - RESCOMP="$WINDRES" -else - case "${host}" in - *-*-cygwin* | *-*-mingw32* ) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args. -set dummy ${ac_tool_prefix}windres; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$WINDRES"; then - ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_WINDRES="${ac_tool_prefix}windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -WINDRES=$ac_cv_prog_WINDRES -if test -n "$WINDRES"; then - { echo "$as_me:$LINENO: result: $WINDRES" >&5 -echo "${ECHO_T}$WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } +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 -fi -if test -z "$ac_cv_prog_WINDRES"; then - ac_ct_WINDRES=$WINDRES - # Extract the first word of "windres", so it can be a program name with args. -set dummy windres; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_WINDRES"; then - ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_WINDRES="windres" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + { 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. */ -fi -fi -ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES -if test -n "$ac_ct_WINDRES"; then - { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5 -echo "${ECHO_T}$ac_ct_WINDRES" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi +int +main () +{ - if test "x$ac_ct_WINDRES" = x; then - WINDRES="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; + ; + 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 - WINDRES=$ac_ct_WINDRES - fi -else - WINDRES="$ac_cv_prog_WINDRES" -fi - - RESCOMP="$WINDRES" - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +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 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { { 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 -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi + { 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. */ - ;; - esac -fi +int +main () +{ -{ echo "$as_me:$LINENO: checking if make is GNU make" >&5 -echo $ECHO_N "checking if make is GNU make... $ECHO_C" >&6; } -if test "${wx_cv_prog_makeisgnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + ; + 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 - if ( ${SHELL-sh} -c "${MAKE-make} --version" 2> /dev/null | - $EGREP -s GNU > /dev/null); then - wx_cv_prog_makeisgnu="yes" - else - wx_cv_prog_makeisgnu="no" - fi - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_prog_makeisgnu" >&5 -echo "${ECHO_T}$wx_cv_prog_makeisgnu" >&6; } - -if test "x$wx_cv_prog_makeisgnu" = "xyes"; then - IF_GNU_MAKE="" -else - IF_GNU_MAKE="#" + { { 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 - -if test "x$wx_cv_prog_makeisgnu" != "xyes"; then -{ echo "$as_me:$LINENO: checking if make supports VPATH" >&5 -echo $ECHO_N "checking if make supports VPATH... $ECHO_C" >&6; } -if test "${wx_cv_prog_makevpath+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -cat - << EOF > confMake -check : file - cp \$? \$@ - cp \$? final_file -EOF - -if test ! -d sub ; then - mkdir sub -fi -echo dummy > sub/file -${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null -RESULT=$? -rm -f sub/file check final_file confMake -rmdir sub -if test "$RESULT" = 0; then - wx_cv_prog_makevpath="yes" -else - wx_cv_prog_makevpath="no" fi -fi -{ echo "$as_me:$LINENO: result: $wx_cv_prog_makevpath" >&5 -echo "${ECHO_T}$wx_cv_prog_makevpath" >&6; } - -if test "x$wx_cv_prog_makevpath" != "xyes"; then -{ { echo "$as_me:$LINENO: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&5 -echo "$as_me: error: -You need a make-utility that is able to use the variable -VPATH correctly. -If your version of make does not support VPATH correctly, -please install GNU-make (possibly as gmake), and start -configure with the following command: -export MAKE=gmake; ./configure for sh-type shells -setenv MAKE gmake; ./configure for csh-type shells -Also please do remember to use gmake in this case every time -you are trying to compile. -" >&2;} - { (exit 1); exit 1; }; } -fi fi -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } -fi +case "${host}" in + *-*-darwin* ) + INSTALL_PROGRAM="cp -fp" + INSTALL_DATA="cp -fp" + ;; + *) + ;; +esac if test "x$XLCXX" = "xyes" -a "x$USE_AIX" = "x1"; then @@ -21084,11 +21512,139 @@ done - - - - -for ac_header in stdlib.h fnmatch.h langinfo.h malloc.h unistd.h wchar.h +for ac_header in langinfo.h wchar.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +if test "$ac_cv_header_wchar_h" != "yes"; then + +for ac_header in wcstr.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + +fi + +case "${host}" in + *-pc-os2_emx | *-pc-os2-emx ) + if test $ac_cv_header_langinfo_h = "yes" \ + -a \( "$wx_cv_gccversion" = "EMX2" \ + -o "$wx_cv_gccversion" = "EMX3" \ + -o "$wx_cv_gccversion" = "Innotek5" \); then + LIBS="$LIBS -lintl" + fi + ;; +esac + +if test "$USE_UNIX" = 1 ; then + +for ac_header in sys/select.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -21145,114 +21701,6 @@ fi done - -if test "$ac_cv_header_wchar_h" != "yes"; then - { echo "$as_me:$LINENO: checking for wcstr.h" >&5 -echo $ECHO_N "checking for wcstr.h... $ECHO_C" >&6; } -if test "${ac_cv_header_wcstr_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_wcstr_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_wcstr_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_wcstr_h" >&5 -echo "${ECHO_T}$ac_cv_header_wcstr_h" >&6; } - - -fi - -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - if test $ac_cv_header_langinfo_h = "yes" \ - -a \( "$wx_cv_gccversion" = "EMX2" \ - -o "$wx_cv_gccversion" = "EMX3" \ - -o "$wx_cv_gccversion" = "Innotek5" \); then - LIBS="$LIBS -lintl" - fi - ;; -esac - -if test "$USE_UNIX" = 1 ; then - { echo "$as_me:$LINENO: checking for sys/select.h" >&5 -echo $ECHO_N "checking for sys/select.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sys_select_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_cv_header_sys_select_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_sys_select_h=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_select_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_select_h" >&6; } - - fi @@ -25989,9 +26437,13 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { echo "$as_me:$LINENO: checking for iostream" >&5 -echo $ECHO_N "checking for iostream... $ECHO_C" >&6; } -if test "${ac_cv_header_iostream+set}" = set; then + +for ac_header in iostream +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -26002,7 +26454,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -26021,19 +26473,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_iostream=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_iostream=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_iostream" >&5 -echo "${ECHO_T}$ac_cv_header_iostream" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done if test "$ac_cv_header_iostream" = "yes" ; then @@ -27185,6 +27645,74 @@ _ACEOF fi fi + + + if test -n "$GCC"; then + { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5 +echo $ECHO_N "checking for __sync_fetch_* builtins... $ECHO_C" >&6; } + if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + int value=0; + __sync_fetch_and_add(&value, 1); + __sync_sub_and_fetch(&value, 1); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_cc_gcc_atomic_builtins=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_gcc_atomic_builtins=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi + + { echo "$as_me:$LINENO: result: $wx_cv_cc_gcc_atomic_builtins" >&5 +echo "${ECHO_T}$wx_cv_cc_gcc_atomic_builtins" >&6; } + if test $wx_cv_cc_gcc_atomic_builtins = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_GCC_ATOMIC_BUILTINS 1 +_ACEOF + + fi + fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -28711,8 +29239,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 @@ -29904,9 +30430,13 @@ TOOLKIT_INCLUDE= WIDGET_SET= if test "$USE_WIN32" = 1 ; then - { echo "$as_me:$LINENO: checking for w32api.h" >&5 -echo $ECHO_N "checking for w32api.h... $ECHO_C" >&6; } -if test "${ac_cv_header_w32api_h+set}" = set; then + +for ac_header in w32api.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -29917,7 +30447,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -29936,19 +30466,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_w32api_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_w32api_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_w32api_h" >&5 -echo "${ECHO_T}$ac_cv_header_w32api_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done { echo "$as_me:$LINENO: checking for windows.h" >&5 echo $ECHO_N "checking for windows.h... $ECHO_C" >&6; } @@ -33836,12 +34374,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; } @@ -34720,9 +35252,7 @@ fi if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then - if test "$TOOLKIT" = "DFB" ; then - wxUSE_UNICODE_UTF8=yes - elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then + if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then wxUSE_UNICODE_UTF8=yes elif test "$USE_OS2" = "1" ; then wxUSE_UNICODE_UTF8=yes @@ -34734,9 +35264,13 @@ fi if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then - { echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5 -echo $ECHO_N "checking for X11/Xlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_Xlib_h+set}" = set; then + +for ac_header in X11/Xlib.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34747,7 +35281,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -34766,23 +35300,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_X11_Xlib_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_X11_Xlib_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_Xlib_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done - { echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5 -echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then +for ac_header in X11/XKBlib.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -34797,7 +35343,7 @@ cat >>conftest.$ac_ext <<_ACEOF #endif -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -34816,19 +35362,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_X11_XKBlib_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_X11_XKBlib_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF +fi + +done fi fi @@ -35182,9 +35736,13 @@ echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; } if test "$ac_find_libraries" != "" ; then { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } - { echo "$as_me:$LINENO: checking for X11/extensions/xf86vmode.h" >&5 -echo $ECHO_N "checking for X11/extensions/xf86vmode.h... $ECHO_C" >&6; } -if test "${ac_cv_header_X11_extensions_xf86vmode_h+set}" = set; then + +for ac_header in X11/extensions/xf86vmode.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -35199,7 +35757,7 @@ cat >>conftest.$ac_ext <<_ACEOF #endif -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -35218,24 +35776,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_X11_extensions_xf86vmode_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_X11_extensions_xf86vmode_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_xf86vmode_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_extensions_xf86vmode_h" >&6; } -if test $ac_cv_header_X11_extensions_xf86vmode_h = yes; then +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" fi +done else { echo "$as_me:$LINENO: result: no" >&5 @@ -35440,25 +36003,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 @@ -35478,98 +36035,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 @@ -35861,6 +36338,11 @@ cat >>conftest.$ac_ext <<_ACEOF error this gcc is too old; #endif + /* visibility only makes sense for ELF shared libs: */ + #if !defined(__ELF__) && !defined(__APPLE__) + error this platform has no visibility; + #endif + extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); @@ -35919,6 +36401,90 @@ 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" + wx_save_LDFLAGS="$LDFLAGS" + CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY" + LDFLAGS="$LDFLAGS -shared -fPIC" + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + +int +main () +{ + + std::string s("hello"); + return s.length(); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_cxx_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + wx_cv_cc_broken_libstdcxx_visibility=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + wx_cv_cc_broken_libstdcxx_visibility=yes +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + CXXFLAGS="$wx_save_CXXFLAGS" + LDFLAGS="$wx_save_LDFLAGS" +fi + + { echo "$as_me:$LINENO: result: $wx_cv_cc_broken_libstdcxx_visibility" >&5 +echo "${ECHO_T}$wx_cv_cc_broken_libstdcxx_visibility" >&6; } + if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_BROKEN_LIBSTDCXX_VISIBILITY 1 +_ACEOF + + fi + else CFLAGS_VISIBILITY="" CXXFLAGS_VISIBILITY="" @@ -36270,154 +36836,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then - WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" - WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" - - LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" - - # Extract the first word of "Rez", so it can be a program name with args. -set dummy Rez; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_REZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$REZ"; then - ac_cv_prog_REZ="$REZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_REZ="Rez" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez" -fi -fi -REZ=$ac_cv_prog_REZ -if test -n "$REZ"; then - { echo "$as_me:$LINENO: result: $REZ" >&5 -echo "${ECHO_T}$REZ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - # Extract the first word of "DeRez", so it can be a program name with args. -set dummy DeRez; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_DEREZ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$DEREZ"; then - ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DEREZ="DeRez" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" -fi -fi -DEREZ=$ac_cv_prog_DEREZ -if test -n "$DEREZ"; then - { echo "$as_me:$LINENO: result: $DEREZ" >&5 -echo "${ECHO_T}$DEREZ" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - # Extract the first word of "SetFile", so it can be a program name with args. -set dummy SetFile; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_SETFILE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$SETFILE"; then - ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_SETFILE="SetFile" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile" -fi -fi -SETFILE=$ac_cv_prog_SETFILE -if test -n "$SETFILE"; then - { echo "$as_me:$LINENO: result: $SETFILE" >&5 -echo "${ECHO_T}$SETFILE" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - - MACSETFILE="\$(SETFILE)" - - if test "$wxUSE_MAC" = 1; then - POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" - RESCOMP="$REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" - else - POSTLINK_COMMAND="echo -n | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" - RESCOMP="echo -n \| $REZ" - WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" - fi - -else - MACSETFILE="@true" - - if test "$wxUSE_PM" = 1; then - RESCOMP="emxbind" - WXCONFIG_RESFLAGS="-ep" - - POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" - else - POSTLINK_COMMAND="@true" - fi - -fi - - { echo "$as_me:$LINENO: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; } @@ -37867,338 +38285,12 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - wx_cv_func_snprintf_decl=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_func_snprintf_decl=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5 -echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; } - - if test "$wx_cv_func_snprintf_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_SNPRINTF_DECL 1 -_ACEOF - - - { echo "$as_me:$LINENO: checking if snprintf declaration is broken" >&5 -echo $ECHO_N "checking if snprintf declaration is broken... $ECHO_C" >&6; } -if test "${wx_cv_func_broken_snprintf_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - #ifdef __MSL__ - #if __MSL__ >= 0x6000 - namespace std {} - using namespace std; - #endif - #endif - -int -main () -{ - - char *buf; - const char *fmt = "%s"; - snprintf(buf, 10u, fmt, "wx"); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_func_broken_snprintf_decl=no -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_func_broken_snprintf_decl=yes - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_snprintf_decl" >&5 -echo "${ECHO_T}$wx_cv_func_broken_snprintf_decl" >&6; } - - if test "$wx_cv_func_broken_snprintf_decl" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_SNPRINTF_DECL 1 -_ACEOF - - fi - fi - - if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then - - { echo "$as_me:$LINENO: checking if snprintf supports positional arguments" >&5 -echo $ECHO_N "checking if snprintf supports positional arguments... $ECHO_C" >&6; } -if test "${wx_cv_func_snprintf_pos_params+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - - { echo "$as_me:$LINENO: WARNING: Assuming Unix98 printf() is not available, -define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5 -echo "$as_me: WARNING: Assuming Unix98 printf() is not available, -define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;} - wx_cv_func_snprintf_pos_params=no - - -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - - int main (void) - { - char buffer[128]; - snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3); - if (strcmp ("2 3 1", buffer) == 0) - exit (0); - exit (1); - } - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - wx_cv_func_snprintf_pos_params=no -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -wx_cv_func_snprintf_pos_params=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_pos_params" >&5 -echo "${ECHO_T}$wx_cv_func_snprintf_pos_params" >&6; } - - if test "$wx_cv_func_snprintf_pos_params" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_UNIX98_PRINTF 1 -_ACEOF - - fi - fi -fi - -if test "$wxUSE_UNICODE" = yes; then - - -for ac_func in swprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - - if test "$ac_cv_func_swprintf" = "yes"; then - { echo "$as_me:$LINENO: checking if swprintf declaration is broken" >&5 -echo $ECHO_N "checking if swprintf declaration is broken... $ECHO_C" >&6; } -if test "${wx_cv_func_broken_swprintf_decl+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - #include - -int -main () -{ - - wchar_t *buf; - const wchar_t *fmt = L"test"; - swprintf(buf, 10u, fmt); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_func_broken_swprintf_decl=no + wx_cv_func_snprintf_decl=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - wx_cv_func_broken_swprintf_decl=yes + wx_cv_func_snprintf_decl=no fi @@ -38206,24 +38298,114 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_broken_swprintf_decl" >&5 -echo "${ECHO_T}$wx_cv_func_broken_swprintf_decl" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_decl" >&5 +echo "${ECHO_T}$wx_cv_func_snprintf_decl" >&6; } + + if test "$wx_cv_func_snprintf_decl" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_SNPRINTF_DECL 1 +_ACEOF + + fi + + if test "$wxUSE_PRINTF_POS_PARAMS" = "yes"; then + + { echo "$as_me:$LINENO: checking if snprintf supports positional arguments" >&5 +echo $ECHO_N "checking if snprintf supports positional arguments... $ECHO_C" >&6; } +if test "${wx_cv_func_snprintf_pos_params+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + if test "$cross_compiling" = yes; then + + { echo "$as_me:$LINENO: WARNING: Assuming Unix98 printf() is not available, +define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&5 +echo "$as_me: WARNING: Assuming Unix98 printf() is not available, +define HAVE_UNIX98_PRINTF as 1 in setup.h if it is available." >&2;} + wx_cv_func_snprintf_pos_params=no + + +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + + int main (void) + { + char buffer[128]; + snprintf (buffer, 128, "%2$d %3$d %1$d", 1, 2, 3); + if (strcmp ("2 3 1", buffer) == 0) + exit (0); + exit (1); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + wx_cv_func_snprintf_pos_params=no +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "$wx_cv_func_broken_swprintf_decl" = "yes"; then +( exit $ac_status ) +wx_cv_func_snprintf_pos_params=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + + + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_snprintf_pos_params" >&5 +echo "${ECHO_T}$wx_cv_func_snprintf_pos_params" >&6; } + + if test "$wx_cv_func_snprintf_pos_params" = "yes"; then cat >>confdefs.h <<\_ACEOF -#define HAVE_BROKEN_SWPRINTF_DECL 1 +#define HAVE_UNIX98_PRINTF 1 _ACEOF fi fi +fi + +if test "$wxUSE_UNICODE" = yes; then wchar_headers="#include #include " case "${host}" in *-*-solaris2* ) - { echo "$as_me:$LINENO: checking for widec.h" >&5 -echo $ECHO_N "checking for widec.h... $ECHO_C" >&6; } -if test "${ac_cv_header_widec_h+set}" = set; then + +for ac_header in widec.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -38234,7 +38416,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -38253,19 +38435,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_widec_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_widec_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_widec_h" >&5 -echo "${ECHO_T}$ac_cv_header_widec_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done if test "$ac_cv_header_widec_h" = "yes"; then wchar_headers="$wchar_headers @@ -38274,7 +38464,7 @@ echo "${ECHO_T}$ac_cv_header_widec_h" >&6; } esac - for wx_func in wputc wputchar putws fputws wprintf vswprintf + for wx_func in putws fputws wprintf vswprintf do { echo "$as_me:$LINENO: checking for $wx_func" >&5 echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } @@ -38406,90 +38596,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext; fi -if test "x$ac_cv_header_fnmatch_h" = "xyes"; then - - for wx_func in fnmatch - do - { echo "$as_me:$LINENO: checking for $wx_func" >&5 -echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; } -if { as_var=wx_cv_func_$wx_func; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF - - /* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - $ac_includes_default - -int -main () -{ - - #ifndef $wx_func - &$wx_func; - #endif - - - ; - return 0; -} - -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval wx_cv_func_$wx_func=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval wx_cv_func_$wx_func=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -ac_res=`eval echo '${'wx_cv_func_$wx_func'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } - - if eval test \$wx_cv_func_$wx_func = yes - then - cat >>confdefs.h <<_ACEOF -#define HAVE_`echo $wx_func | tr 'a-z' 'A-Z'` 1 -_ACEOF - - - else - : - - fi - done - -fi - if test "$wxUSE_FILE" = "yes"; then for wx_func in fsync @@ -39784,15 +39890,111 @@ fi done - if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then - { echo "$as_me:$LINENO: WARNING: wxSingleInstanceChecker not available" >&5 -echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} - wxUSE_SNGLINST_CHECKER=no - fi -fi - - -for ac_func in timegm + if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxSingleInstanceChecker not available" >&5 +echo "$as_me: WARNING: wxSingleInstanceChecker not available" >&2;} + wxUSE_SNGLINST_CHECKER=no + fi +fi + + + +for ac_func in setenv putenv +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + break +fi +done + +if test "$ac_cv_func_setenv" = "yes"; then + +for ac_func in unsetenv do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` { echo "$as_me:$LINENO: checking for $ac_func" >&5 @@ -39885,102 +40087,7 @@ _ACEOF fi done - - - -for ac_func in putenv setenv -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - break fi -done - HAVE_SOME_SLEEP_FUNC=0 if test "$USE_BEOS" = 1; then @@ -41516,9 +41623,13 @@ _ACEOF fi - { echo "$as_me:$LINENO: checking for sched.h" >&5 -echo $ECHO_N "checking for sched.h... $ECHO_C" >&6; } -if test "${ac_cv_header_sched_h+set}" = set; then + +for ac_header in sched.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -41529,7 +41640,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -41548,19 +41659,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_sched_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_sched_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_sched_h" >&5 -echo "${ECHO_T}$ac_cv_header_sched_h" >&6; } +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi +done if test "$ac_cv_header_sched_h" = "yes"; then { echo "$as_me:$LINENO: checking for sched_yield" >&5 @@ -42785,94 +42904,6 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking for readdir_r" >&5 -echo $ECHO_N "checking for readdir_r... $ECHO_C" >&6; } -if test "${ac_cv_func_readdir_r+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define readdir_r to an innocuous variant, in case declares readdir_r. - For example, HP-UX 11i declares gettimeofday. */ -#define readdir_r innocuous_readdir_r - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char readdir_r (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef readdir_r - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char readdir_r (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_readdir_r || defined __stub___readdir_r -choke me -#endif - -int -main () -{ -return readdir_r (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_readdir_r=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_readdir_r=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_readdir_r" >&5 -echo "${ECHO_T}$ac_cv_func_readdir_r" >&6; } -if test $ac_cv_func_readdir_r = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_READDIR_R 1 -_ACEOF - -fi - @@ -44946,6 +44977,97 @@ echo "${ECHO_T}no" >&6; } fi if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then + + if test "$wxUSE_GTKPRINT" = "yes" ; then + + +pkg_failed=no +{ echo "$as_me:$LINENO: checking for GTKPRINT" >&5 +echo $ECHO_N "checking for GTKPRINT... $ECHO_C" >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$GTKPRINT_CFLAGS"; then + pkg_cv_GTKPRINT_CFLAGS="$GTKPRINT_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKPRINT_CFLAGS=`$PKG_CONFIG --cflags "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$GTKPRINT_LIBS"; then + pkg_cv_GTKPRINT_LIBS="$GTKPRINT_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-unix-print-2.0 >= 2.10\"") >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-unix-print-2.0 >= 2.10") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_GTKPRINT_LIBS=`$PKG_CONFIG --libs "gtk+-unix-print-2.0 >= 2.10" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"` + else + GTKPRINT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-unix-print-2.0 >= 2.10"` + fi + # Put the nasty error message in config.log where it belongs + echo "$GTKPRINT_PKG_ERRORS" >&5 + + + { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 +echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} + wxUSE_GTKPRINT="no" + + +elif test $pkg_failed = untried; then + + { echo "$as_me:$LINENO: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&5 +echo "$as_me: WARNING: GTK printing support not found (GTK+ >= 2.10), library will use GNOME printing support or standard PostScript printing" >&2;} + wxUSE_GTKPRINT="no" + + +else + GTKPRINT_CFLAGS=$pkg_cv_GTKPRINT_CFLAGS + GTKPRINT_LIBS=$pkg_cv_GTKPRINT_LIBS + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + CFLAGS="$GTKPRINT_CFLAGS $CFLAGS" + CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_GTKPRINT 1 +_ACEOF + + +fi + fi + if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then @@ -45545,26 +45667,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 @@ -45584,122 +45699,257 @@ 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; } +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF -# 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 +fi + +done + + if test "$ac_cv_header_sys_epoll_h" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_EPOLL_DISPATCHER 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 +echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} + fi + fi + fi +fi + + + + +for ac_func in gettimeofday ftime +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <$ac_header> +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" +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_cpp conftest.$ac_ext") 2>conftest.er1 + (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || test ! -s conftest.err - }; then - ac_header_preproc=yes + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$as_ac_var=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" +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` +ac_res=`eval echo '${'$as_ac_var'}'` { echo "$as_me:$LINENO: result: $ac_res" >&5 echo "${ECHO_T}$ac_res" >&6; } - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + break +fi +done + + +if test "$ac_cv_func_gettimeofday" = "yes"; then + { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5 +echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; } +if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + struct timeval tv; + gettimeofday(&tv, NULL); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_func_gettimeofday_has_2_args=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + +int +main () +{ + + struct timeval tv; + gettimeofday(&tv); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + wx_cv_func_gettimeofday_has_2_args=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5 +echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} + wx_cv_func_gettimeofday_has_2_args=unknown + fi -done +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$ac_cv_header_sys_epoll_h" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_EPOLL_DISPATCHER 1 +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5 +echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; } + + if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then + cat >>confdefs.h <<\_ACEOF +#define WX_GETTIMEOFDAY_NO_TZ 1 _ACEOF - else - { echo "$as_me:$LINENO: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&5 -echo "$as_me: WARNING: sys/epoll.h not available, wxEpollDispatcher disabled" >&2;} - fi - fi fi fi - if test "$wxUSE_DATETIME" = "yes"; then { echo "$as_me:$LINENO: checking for strptime" >&5 echo $ECHO_N "checking for strptime... $ECHO_C" >&6; } @@ -46258,244 +46508,29 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - - wx_cv_struct_tm_has_gmtoff=yes - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - wx_cv_struct_tm_has_gmtoff=no - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5 -echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; } - fi - - if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define WX_GMTOFF_IN_TM 1 -_ACEOF - - fi - - - -for ac_func in gettimeofday ftime -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - break -fi -done - - - if test "$ac_cv_func_gettimeofday" = "yes"; then - { echo "$as_me:$LINENO: checking whether gettimeofday takes two arguments" >&5 -echo $ECHO_N "checking whether gettimeofday takes two arguments... $ECHO_C" >&6; } -if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - -int -main () -{ - - struct timeval tv; - gettimeofday(&tv, NULL); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_func_gettimeofday_has_2_args=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - #include - #include - -int -main () -{ - - struct timeval tv; - gettimeofday(&tv); - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - wx_cv_func_gettimeofday_has_2_args=no + + wx_cv_struct_tm_has_gmtoff=yes + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - - { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5 -echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;} - wx_cv_func_gettimeofday_has_2_args=unknown - - -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + wx_cv_struct_tm_has_gmtoff=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5 -echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; } +{ echo "$as_me:$LINENO: result: $wx_cv_struct_tm_has_gmtoff" >&5 +echo "${ECHO_T}$wx_cv_struct_tm_has_gmtoff" >&6; } + fi - if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then - cat >>confdefs.h <<\_ACEOF -#define WX_GETTIMEOFDAY_NO_TZ 1 + if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define WX_GMTOFF_IN_TM 1 _ACEOF - fi fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest" @@ -47193,9 +47228,13 @@ echo "${ECHO_T}$wxUSE_JOYSTICK" >&6; } else if test "$wxUSE_MGL" != "1"; then - { echo "$as_me:$LINENO: checking for linux/joystick.h" >&5 -echo $ECHO_N "checking for linux/joystick.h... $ECHO_C" >&6; } -if test "${ac_cv_header_linux_joystick_h+set}" = set; then + +for ac_header in linux/joystick.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF @@ -47206,7 +47245,7 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default -#include +#include <$ac_header> _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" @@ -47225,22 +47264,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then - ac_cv_header_linux_joystick_h=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_header_linux_joystick_h=no + eval "$as_ac_Header=no" fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_linux_joystick_h" >&5 -echo "${ECHO_T}$ac_cv_header_linux_joystick_h" >&6; } -if test $ac_cv_header_linux_joystick_h = yes; then - wxUSE_JOYSTICK=yes +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + wxUSE_JOYSTICK=yes fi +done fi fi @@ -47259,6 +47303,13 @@ fi +if test "$wxUSE_FONTENUM" = "yes" ; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FONTENUM 1 +_ACEOF + +fi + if test "$wxUSE_FONTMAP" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define wxUSE_FONTMAP 1 @@ -47366,13 +47417,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 @@ -47463,11 +47507,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 @@ -47836,7 +47875,6 @@ if test "$wxUSE_CHECKLST" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst" fi if test "$wxUSE_COLOURPICKERCTRL" = "yes"; then @@ -47863,6 +47901,14 @@ _ACEOF USES_CONTROLS=1 fi +if test "$wxUSE_FILECTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_FILECTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_FILEPICKERCTRL" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_FILEPICKERCTRL 1 @@ -47889,7 +47935,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 @@ -47963,7 +48009,6 @@ if test "$wxUSE_LISTBOX" = "yes"; then _ACEOF USES_CONTROLS=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox" fi if test "$wxUSE_LISTCTRL" = "yes"; then @@ -48007,7 +48052,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS combo" fi - if test "$wxUSE_RADIOBOX" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_RADIOBOX 1 @@ -48287,13 +48331,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi -if test "$wxUSE_DC_CACHEING" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_DC_CACHEING 1 -_ACEOF - -fi - if test "$wxUSE_DRAGIMAGE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_DRAGIMAGE 1 @@ -48469,7 +48506,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 @@ -48477,10 +48513,14 @@ if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then #define wxUSE_SYSTEM_OPTIONS 1 _ACEOF - if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ - "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" - fi +fi + +if test "$wxUSE_TASKBARICON" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TASKBARICON 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" fi @@ -48693,6 +48733,63 @@ _ACEOF fi +if test "$wxUSE_MSW" = 1 ; then + + if test "$wxUSE_DC_CACHEING" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_DC_CACHEING 1 +_ACEOF + + fi + + if test "$wxUSE_DIB" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WXDIB 1 +_ACEOF + + fi + + if test "$wxUSE_OWNER_DRAWN" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_OWNER_DRAWN 1 +_ACEOF + + fi + + if test "$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 +_ACEOF + + fi + + if test "$wxUSE_UXTHEME" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_UXTHEME 1 +_ACEOF + + fi + +fi + + +if test "$USE_WIN32" = 1 ; then + if test "$wxUSE_INICONF" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_INICONF 1 +_ACEOF + + fi + + if test "$wxUSE_REGKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_REGKEY 1 +_ACEOF + + fi +fi + + if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then cat >>confdefs.h <<\_ACEOF @@ -49100,9 +49197,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" @@ -49285,6 +49382,7 @@ fi + TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"` @@ -49301,6 +49399,9 @@ case "$TOOLKIT" in TOOLKIT_DESC="GTK+" if test "$WXGTK20" = 1; then TOOLKIT_DESC="$TOOLKIT_DESC 2" + if test "$wxUSE_GTKPRINT" = "yes" ; then + TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; + fi if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint"; fi @@ -49330,23 +49431,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 @@ -52451,6 +52535,100 @@ echo "$as_me: error: Versions of Bakefile used to generate makefiles ($BAKEFILE_ fi +case ${INSTALL} in + /* ) # Absolute + ;; + ?:* ) # Drive letter, considered as absolute. + ;; + *) + INSTALL=`pwd`/${INSTALL} ;; +esac + +if test "$wxUSE_GUI" = "yes"; then + +if test "$wxUSE_MSW" = 1 ; then + if test "x$WINDRES" = "x"; then + { { echo "$as_me:$LINENO: error: Required windres program not found" >&5 +echo "$as_me: error: Required windres program not found" >&2;} + { (exit 1); exit 1; }; } + fi + + RESCOMP="$WINDRES" +fi + +if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then + WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r" + WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc" + + LIBWXMACRES="\$(wx_top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}" + + # Extract the first word of "DeRez", so it can be a program name with args. +set dummy DeRez; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_DEREZ+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$DEREZ"; then + ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_DEREZ="DeRez" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez" +fi +fi +DEREZ=$ac_cv_prog_DEREZ +if test -n "$DEREZ"; then + { echo "$as_me:$LINENO: result: $DEREZ" >&5 +echo "${ECHO_T}$DEREZ" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + + MACSETFILE="\$(SETFILE)" + + if test "$wxUSE_MAC" = 1; then + POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o" + RESCOMP="$REZ" + WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o" + else + POSTLINK_COMMAND="cat /dev/null | \$(REZ) -d __DARWIN__ -t APPL ${LIBWXMACRES}" + RESCOMP="cat /dev/null \| $REZ" + WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL \$libdir/$WX_RESOURCES_MACOSX_ASCII" + fi + +else + MACSETFILE="@true" + + if test "$wxUSE_PM" = 1; then + RESCOMP="emxbind" + WXCONFIG_RESFLAGS="-ep" + + POSTLINK_COMMAND="$RESCOMP $WXCONFIG_RESFLAGS" + else + POSTLINK_COMMAND="@true" + fi +fi + +fi + + if test $GCC_PCH = 1 then if test "$wx_cv_gcc_pch_bug" = yes; then @@ -53527,16 +53705,7 @@ EGREP!$EGREP$ac_delim CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim -RANLIB!$RANLIB$ac_delim AR!$AR$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -STRIP!$STRIP$ac_delim -WINDRES!$WINDRES$ac_delim -DLLTOOL!$DLLTOOL$ac_delim -IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim -LN_S!$LN_S$ac_delim subdirs!$subdirs$ac_delim PKG_CONFIG!$PKG_CONFIG$ac_delim GTK_CFLAGS!$GTK_CFLAGS$ac_delim @@ -53557,10 +53726,19 @@ PANGOXFT_CFLAGS!$PANGOXFT_CFLAGS$ac_delim PANGOXFT_LIBS!$PANGOXFT_LIBS$ac_delim CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim -REZ!$REZ$ac_delim -DEREZ!$DEREZ$ac_delim -SETFILE!$SETFILE$ac_delim LIBICONV!$LIBICONV$ac_delim +SDL_CONFIG!$SDL_CONFIG$ac_delim +SDL_CFLAGS!$SDL_CFLAGS$ac_delim +SDL_LIBS!$SDL_LIBS$ac_delim +GTKPRINT_CFLAGS!$GTKPRINT_CFLAGS$ac_delim +GTKPRINT_LIBS!$GTKPRINT_LIBS$ac_delim +LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim +LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim +GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim +GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim +HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim +HILDON_LIBS!$HILDON_LIBS$ac_delim +CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53602,16 +53780,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -SDL_CONFIG!$SDL_CONFIG$ac_delim -SDL_CFLAGS!$SDL_CFLAGS$ac_delim -SDL_LIBS!$SDL_LIBS$ac_delim -LIBGNOMEPRINTUI_CFLAGS!$LIBGNOMEPRINTUI_CFLAGS$ac_delim -LIBGNOMEPRINTUI_LIBS!$LIBGNOMEPRINTUI_LIBS$ac_delim -GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim -GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim -HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim -HILDON_LIBS!$HILDON_LIBS$ac_delim -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim CAIRO_LIBS!$CAIRO_LIBS$ac_delim GST_CFLAGS!$GST_CFLAGS$ac_delim GST_LIBS!$GST_LIBS$ac_delim @@ -53642,6 +53810,7 @@ EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim +EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim EXTRALIBS_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim @@ -53656,12 +53825,19 @@ SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim HOST_SUFFIX!$HOST_SUFFIX$ac_delim CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim +RANLIB!$RANLIB$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +LN_S!$LN_S$ac_delim SET_MAKE!$SET_MAKE$ac_delim MAKE_SET!$MAKE_SET$ac_delim AROPTIONS!$AROPTIONS$ac_delim +STRIP!$STRIP$ac_delim NM!$NM$ac_delim INSTALL_DIR!$INSTALL_DIR$ac_delim LDFLAGS_GUI!$LDFLAGS_GUI$ac_delim +IF_GNU_MAKE!$IF_GNU_MAKE$ac_delim PLATFORM_UNIX!$PLATFORM_UNIX$ac_delim PLATFORM_WIN32!$PLATFORM_WIN32$ac_delim PLATFORM_MSDOS!$PLATFORM_MSDOS$ac_delim @@ -53694,11 +53870,13 @@ USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim SONAME_FLAG!$SONAME_FLAG$ac_delim DEPS_TRACKING!$DEPS_TRACKING$ac_delim BK_DEPS!$BK_DEPS$ac_delim +WINDRES!$WINDRES$ac_delim +REZ!$REZ$ac_delim +SETFILE!$SETFILE$ac_delim GCC_PCH!$GCC_PCH$ac_delim ICC_PCH!$ICC_PCH$ac_delim BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim -COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53740,6 +53918,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim @@ -53836,7 +54015,6 @@ COND_SHARED_1!$COND_SHARED_1$ac_delim COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim COND_SHARED_1_USE_XRC_1!$COND_SHARED_1_USE_XRC_1$ac_delim COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim -COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -53878,6 +54056,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim @@ -53948,6 +54127,7 @@ COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim COND_WXUSE_ODBC_BUILTIN!$COND_WXUSE_ODBC_BUILTIN$ac_delim COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim +DEREZ!$DEREZ$ac_delim SHARED!$SHARED$ac_delim WX_LIBRARY_BASENAME_NOGUI!$WX_LIBRARY_BASENAME_NOGUI$ac_delim WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim @@ -53973,8 +54153,6 @@ WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim EXE_LINKER!$EXE_LINKER$ac_delim -GUIDIST!$GUIDIST$ac_delim -DISTDIR!$DISTDIR$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54016,6 +54194,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +GUIDIST!$GUIDIST$ac_delim +DISTDIR!$DISTDIR$ac_delim SAMPLES_SUBDIRS!$SAMPLES_SUBDIRS$ac_delim LDFLAGS_GL!$LDFLAGS_GL$ac_delim OPENGL_LIBS!$OPENGL_LIBS$ac_delim @@ -54030,12 +54210,13 @@ LIBWXMACRES!$LIBWXMACRES$ac_delim POSTLINK_COMMAND!$POSTLINK_COMMAND$ac_delim MACSETFILE!$MACSETFILE$ac_delim GCC!$GCC$ac_delim +DLLTOOL!$DLLTOOL$ac_delim CPPUNIT_CONFIG!$CPPUNIT_CONFIG$ac_delim LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 17; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -54668,7 +54849,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)" @@ -54684,6 +54865,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}"