#! /bin/sh
-# From configure.in Id: configure.in 49441 2007-10-25 22:43:57Z MW .
+# From configure.in Id: configure.in 59561 2009-03-15 16:07:56Z KO .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
#
host_cpu
host_vendor
host_os
-target
-target_cpu
-target_vendor
-target_os
wx_top_builddir
CC
CFLAGS
CFLAGS_VISIBILITY
CXXFLAGS_VISIBILITY
LIBICONV
+GXX_VERSION
SDL_CONFIG
SDL_CFLAGS
SDL_LIBS
EXTRALIBS
EXTRALIBS_XML
EXTRALIBS_HTML
+EXTRALIBS_MEDIA
EXTRALIBS_GUI
EXTRALIBS_OPENGL
EXTRALIBS_SDL
+EXTRALIBS_STC
WITH_PLUGIN_SDL
EXTRALIBS_GTKPRINT
EXTRALIBS_GNOMEPRINT
DEBUG_FLAG
TOOLKIT_LOWERCASE
TOOLKIT_VERSION
+DYLIB_RPATH_INSTALL
+DYLIB_RPATH_POSTLINK
SAMPLES_RPATH_FLAG
-SAMPLES_RPATH_POSTLINK
+HEADER_PAD_OPTION
HOST_SUFFIX
CPPUNIT_CFLAGS
CPPUNIT_LIBS
WINDRES
REZ
SETFILE
+OBJCXXFLAGS
GCC_PCH
ICC_PCH
+ICC_PCH_CREATE_SWITCH
+ICC_PCH_USE_SWITCH
BK_MAKE_PCH
COND_BUILD_DEBUG
COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
COND_BUILD_RELEASE_UNICODE_0
COND_BUILD_RELEASE_UNICODE_1
+COND_BUILD_debug
+COND_BUILD_debug_DEBUG_FLAG_default
+COND_BUILD_debug_DEBUG_INFO_default
+COND_BUILD_debug_UNICODE_0
+COND_BUILD_debug_UNICODE_1
+COND_BUILD_release
+COND_BUILD_release_DEBUG_INFO_default
+COND_BUILD_release_UNICODE_0
+COND_BUILD_release_UNICODE_1
COND_DEBUG_FLAG_1
COND_DEBUG_INFO_0
COND_DEBUG_INFO_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_0_USE_STC_1
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1
COND_MONOLITHIC_0_SHARED_1_USE_STC_1
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1
COND_MONOLITHIC_0_USE_HTML_1
COND_MONOLITHIC_0_USE_MEDIA_1
+COND_MONOLITHIC_0_USE_PROPGRID_1
COND_MONOLITHIC_0_USE_QA_1
COND_MONOLITHIC_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_STC_1
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
COND_PLATFORM_MACOSX_1_USE_GUI_1
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
COND_PLATFORM_MACOS_1
+COND_PLATFORM_MAC_0
+COND_PLATFORM_MAC_1
+COND_PLATFORM_MSDOS_0
COND_PLATFORM_MSDOS_1
COND_PLATFORM_OS2_1
COND_PLATFORM_UNIX_0
COND_PLATFORM_WIN32_0
COND_PLATFORM_WIN32_1
COND_SHARED_0
+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
+COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin
COND_SHARED_0_USE_STC_1
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN
-COND_SHARED_0_WXUSE_REGEX_BUILTIN
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN
+COND_SHARED_0_wxUSE_EXPAT_builtin
+COND_SHARED_0_wxUSE_REGEX_builtin
+COND_SHARED_0_wxUSE_ZLIB_builtin
COND_SHARED_1
COND_SHARED_1_USE_GUI_1_USE_OPENGL_1
COND_TOOLKIT_
COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0
COND_TOOLKIT_GTK_USE_GUI_1
COND_TOOLKIT_MAC
-COND_TOOLKIT_MAC_USE_GUI_1
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MGL
COND_TOOLKIT_MGL_USE_GUI_1
COND_TOOLKIT_MOTIF
COND_TOOLKIT_MSW_USE_GUI_1
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_MSW_WXUNIV_0
+COND_TOOLKIT_OSX_CARBON
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_COCOA
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0
+COND_TOOLKIT_OSX_IPHONE
COND_TOOLKIT_PM
COND_TOOLKIT_PM_USE_GUI_1
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
+COND_USE_OPENGL_1
COND_USE_PCH_1
COND_USE_PLUGINS_0
COND_USE_RTTI_0
COND_WXUSE_LIBTIFF_BUILTIN
COND_WXUSE_REGEX_BUILTIN
COND_WXUSE_ZLIB_BUILTIN
+COND_wxUSE_EXPAT_builtin
+COND_wxUSE_LIBJPEG_builtin
+COND_wxUSE_LIBPNG_builtin
+COND_wxUSE_LIBTIFF_builtin
+COND_wxUSE_REGEX_builtin
+COND_wxUSE_ZLIB_builtin
DEREZ
SHARED
WX_LIBRARY_BASENAME_NOGUI
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
- --target=TARGET configure for building compilers for TARGET [HOST]
_ACEOF
fi
--disable-gtk2 use GTK+ 1.2 instead of 2.0
--enable-gpe use GNOME PDA Environment features if possible
--disable-shared create static library instead of shared
- --disable-optimise create optimised code
--enable-debug same as debug_flag and debug_info
--enable-stl use STL for containers
--enable-std_iostreams use standard C++ stream classes
--disable-unicode compile without Unicode support
--enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)
--enable-utf8 use UTF-8 representation for strings (Unix only)
- --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
+ --enable-utf8only only support UTF-8 locales in UTF-8 build (Unix only)
--enable-extended_rtti use extended RTTI (XTI)
--enable-omf use OMF object format
--enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)
--enable-debug_info create code with debugging information
+ --disable-optimise compile without optimisations
--enable-debug_gdb create code with extra GDB debugging information
--enable-debug_cntxt use wxDebugContext
--enable-mem_tracing create code with memory tracing
--enable-objc_uniquifying enable Objective-C class name uniquifying
--disable-visibility disable use of ELF symbols visibility even if supported
--enable-intl use internationalization system
+ --enable-xlocale use x-locale support (requires wxLocale)
--enable-config use wxConfig (and derived) classes
--enable-protocols use wxProtocol and derived classes
--enable-ftp use wxFTP (requires wxProtocol
--enable-http use wxHTTP (requires wxProtocol
--enable-fileproto use wxFileProto class (requires wxProtocol
--enable-sockets use socket/network classes
+ --enable-ipv6 enable IPv6 support in wxSocket
--enable-ole use OLE classes (Win32 only)
--enable-dataobj use data object classes
--enable-ipc use interprocess communication (wxSocket etc.)
--enable-log use logging system
--enable-longlong use wxLongLong class
--enable-mimetype use wxMimeTypesManager
+ --enable-printfposparam use wxVsnprintf() which supports positional parameters
--enable-snglinst use wxSingleInstanceChecker class
+ --enable-sound use wxSound class
--enable-stdpaths use wxStandardPaths class
--enable-stopwatch use wxStopWatch class
--enable-streams use wxStream etc classes
--enable-textbuf use wxTextBuffer class
--enable-textfile use wxTextFile class
--enable-timer use wxTimer class
- --enable-sound use wxSound class
- --enable-mediactrl use wxMediaCtrl class
- --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
- --enable-printfposparam use wxVsnprintf() which supports positional parameters
+ --enable-variant use wxVariant class
--enable-zipstream use wxZip streams
--enable-url use wxURL class
- --enable-variant use wxVariant class
--enable-protocol use wxProtocol class
--enable-protocol-http HTTP support in wxProtocol
--enable-protocol-ftp FTP support in wxProtocol
--enable-htmlhelp use wxHTML-based help
--enable-xrc use XRC resources sub-library
--enable-aui use AUI docking library
+ --enable-propgrid use wxPropertyGrid library
--enable-stc use wxStyledTextCtrl library
--enable-constraints use layout-constraints system
- --enable-printarch use printing architecture
- --enable-mdi use multiple document interface architecture
- --enable-mdidoc use docview architecture with MDI
--enable-loggui use standard GUI logger
--enable-logwin use wxLogWindow
--enable-logdialog use wxLogDialog
+ --enable-mdi use multiple document interface architecture
+ --enable-mdidoc use docview architecture with MDI
+ --enable-mediactrl use wxMediaCtrl class
+ --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix
--enable-webkit use wxWebKitCtrl (Mac)
--enable-richtext use wxRichTextCtrl
--enable-graphics_ctx use graphics context 2D drawing API
--enable-postscript use wxPostscriptDC device context (default for gtk+)
+ --enable-printarch use printing architecture
--enable-svg use wxSVGFileDC device context
--enable-clipboard use wxClipboard class
--enable-dnd use Drag'n'Drop classes
--disable-controls disable compilation of all standard controls
--enable-accel use accelerators
--enable-animatectrl use wxAnimationCtrl class
- --enable-button use wxButton class
--enable-bmpbutton use wxBitmapButton class
--enable-bmpcombobox use wxBitmapComboBox class
+ --enable-button use wxButton class
--enable-calendar use wxCalendarCtrl class
--enable-caret use wxCaret class
--enable-checkbox use wxCheckBox class
--enable-colourpicker use wxColourPickerCtrl class
--enable-combobox use wxComboBox class
--enable-comboctrl use wxComboCtrl class
+ --enable-dataviewctrl use wxDataViewCtrl class
--enable-datepick use wxDatePickerCtrl class
+ --enable-detect_sm use code to detect X11 session manager
--enable-dirpicker use wxDirPickerCtrl class
--enable-display use wxDisplay class
- --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-filepicker use wxFilePickerCtrl class
--enable-fontpicker use wxFontPickerCtrl class
--enable-gauge use wxGauge class
--enable-grid use wxGrid class
- --enable-dataviewctrl use wxDataViewCtrl class
+ --enable-headerctrl use wxHeaderCtrl class
--enable-hyperlink use wxHyperlinkCtrl class
--enable-imaglist use wxImageList class
--enable-listbook use wxListbook class
--enable-listbox use wxListBox class
--enable-listctrl use wxListCtrl class
--enable-notebook use wxNotebook class
+ --enable-notifmsg use wxNotificationMessage class
--enable-odcombobox use wxOwnerDrawnComboBox class
+ --enable-popupwin use wxPopUpWindow class
--enable-radiobox use wxRadioBox class
--enable-radiobtn use wxRadioButton class
+ --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog
--enable-sash use wxSashWindow class
--enable-scrollbar use wxScrollBar class and scrollable windows
--enable-searchctrl use wxSearchCtrl class
--enable-statline use wxStaticLine class
--enable-stattext use wxStaticText class
--enable-statusbar use wxStatusBar class
- --enable-tabdialog use wxTabControl class
--enable-taskbaricon use wxTaskBarIcon class
+ --enable-tbarnative use native wxToolBar class
--enable-textctrl use wxTextCtrl class
+ --enable-tipwindow use wxTipWindow class
--enable-togglebtn use wxToggleButton class
--enable-toolbar use wxToolBar class
- --enable-tbarnative use native wxToolBar class
- --enable-treebook use wxTreebook class
--enable-toolbook use wxToolbook class
+ --enable-treebook use wxTreebook class
--enable-treectrl use wxTreeCtrl class
- --enable-tipwindow use wxTipWindow class
- --enable-popupwin use wxPopUpWindow class
--enable-commondlg use all common dialogs
--enable-aboutdlg use wxAboutBox
--enable-choicedlg use wxChoiceDialog
--enable-iff use iff images (IFF file format)
--enable-pnm use pnm images (PNM file format)
--enable-xpm use xpm images (XPM file format)
- --enable-icocur use Windows ICO and CUR formats
+ --enable-ico_cur use Windows ICO and CUR formats
--enable-dccache cache temporary wxDC objects (Win32 only)
--enable-ps-in-msw use PS printing in wxMSW (Win32 only)
- --enable-ownerdrawn use owner drawn controls (Win32 only)
+ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)
--enable-uxtheme enable support for Windows XP themed look (Win32 only)
--enable-wxdib use wxDIB class (Win32 only)
+ --enable-autoidman use automatic ids management
--disable-largefile omit support for large files
--disable-gtktest do not try to compile and run a test GTK+ program
--disable-gtktest Do not try to compile and run a test GTK program
--with-themes=all|list use only the specified comma-separated list of wxUniversal themes
--with-gtk[=VERSION] use GTK+, VERSION can be 2 (default), 1 or "any"
--with-motif use Motif/Lesstif
- --with-mac use Mac OS X
+ --with-osx_carbon use Mac OS X (Carbon)
+ --with-osx_cocoa use Mac OS X (Cocoa)
+ --with-mac use Mac OS X (Default)
--with-cocoa use Cocoa
--with-wine use Wine
--with-msw use MS-Windows
--with-libjpeg use libjpeg (JPEG file format)
--with-libtiff use libtiff (TIFF file format)
--with-libxpm use libxpm (XPM file format)
+ --with-libiconv use libiconv (character conversion)
--with-libmspack use libmspack (CHM help files loading)
--without-gtkprint don't use GTK printing support
--without-gnomeprint don't use GNOME printing libraries
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking target system type" >&5
-echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
-if test "${ac_cv_target+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "x$target_alias" = x; then
- ac_cv_target=$ac_cv_host
-else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-fi
+if test "$cross_compiling" != "no"; then
+ HOST_PREFIX="${host_alias}-"
+ HOST_SUFFIX="-$host_alias"
+else
+ HOST_PREFIX=
+ HOST_SUFFIX=
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
-echo "${ECHO_T}$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
-echo "$as_me: error: invalid value of canonical target" >&2;}
- { (exit 1); exit 1; }; };;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
-
wx_major_version_number=2
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
DEFAULT_wxUSE_COCOA=0
DEFAULT_wxUSE_GTK=0
-DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
-DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
+DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_DFB=0
PROGRAM_EXT=
-SO_SUFFIX=so
SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
DEFAULT_STD_FLAG=yes
USE_HPUX=1
DEFAULT_DEFAULT_wxUSE_MOTIF=1
NEEDS_D_REENTRANT_FOR_R_FUNCS=1
- SO_SUFFIX=sl
cat >>confdefs.h <<\_ACEOF
#define __HPUX__ 1
_ACEOF
USE_AIX=1
USE_SYSV=1
USE_SVR4=1
- SO_SUFFIX=a
cat >>confdefs.h <<\_ACEOF
#define __AIX__ 1
_ACEOF
;;
*-*-cygwin* | *-*-mingw32* )
- SO_SUFFIX=dll
- PROGRAM_EXT=".exe"
+ PROGRAM_EXT=".exe"
DEFAULT_DEFAULT_wxUSE_MSW=1
;;
*-*-darwin* )
USE_BSD=1
USE_DARWIN=1
- SO_SUFFIX=dylib
cat >>confdefs.h <<\_ACEOF
#define __BSD__ 1
_ACEOF
#define TARGET_CARBON 1
_ACEOF
- DEFAULT_DEFAULT_wxUSE_MAC=1
+ DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
powerpc-apple-macos* )
USE_UNIX=0
ac_cv_c_bigendian=yes
- SO_SUFFIX=shlib
- DEFAULT_DEFAULT_wxUSE_MAC=1
+ DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
DEFAULT_STD_FLAG=no
;;
-
- wx_arg_cache_file="configarg.cache"
- echo "loading argument cache $wx_arg_cache_file"
- rm -f ${wx_arg_cache_file}.tmp
- touch ${wx_arg_cache_file}.tmp
- touch ${wx_arg_cache_file}
-
-
DEFAULT_wxUSE_ALL_FEATURES=yes
DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_LIBHILDON=no
DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
-DEFAULT_wxUSE_OPENGL=no
DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
-DEFAULT_wxUSE_MEDIACTRL=no
-DEFAULT_wxUSE_TAB_DIALOG=no
+DEFAULT_wxUSE_IPV6=no
+DEFAULT_wxUSE_GSTREAMER8=no
DEFAULT_wxUSE_UNICODE_UTF8=auto
+DEFAULT_wxUSE_OPENGL=auto
+DEFAULT_wxUSE_MEDIACTRL=auto
+
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
DEFAULT_wxUSE_OBJC_UNIQUIFYING=no
-for toolkit in `echo $ALL_TOOLKITS`; do
- LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
- if test "x$LINE" != "x" ; then
- has_toolkit_in_cache=1
- eval "DEFAULT_$LINE"
- eval "CACHE_$toolkit=1"
-
- LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
- if test "x$LINE" != "x" ; then
- eval "DEFAULT_$LINE"
- fi
- fi
-done
-
-
else
wx_cv_use_gui='wxUSE_GUI=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GUI=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_gui='wxUSE_GUI=${'DEFAULT_wxUSE_GUI":-$defaultval}"
fi
eval "$wx_cv_use_gui"
- if test "x$cache" = xyes; then
- echo "wxUSE_GUI=$wxUSE_GUI" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GUI = yes; then
else
wx_cv_use_monolithic='wxUSE_MONOLITHIC=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MONOLITHIC=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_monolithic='wxUSE_MONOLITHIC=${'DEFAULT_wxUSE_MONOLITHIC":-$defaultval}"
fi
eval "$wx_cv_use_monolithic"
- if test "x$cache" = xyes; then
- echo "wxUSE_MONOLITHIC=$wxUSE_MONOLITHIC" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MONOLITHIC = yes; then
else
wx_cv_use_plugins='wxUSE_PLUGINS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PLUGINS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_plugins='wxUSE_PLUGINS=${'DEFAULT_wxUSE_PLUGINS":-$defaultval}"
fi
eval "$wx_cv_use_plugins"
- if test "x$cache" = xyes; then
- echo "wxUSE_PLUGINS=$wxUSE_PLUGINS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PLUGINS = yes; then
else
wx_cv_use_subdirs='wxWITH_SUBDIRS=no'
fi
- cache=yes
else
- LINE=`grep "^wxWITH_SUBDIRS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_subdirs='wxWITH_SUBDIRS=${'DEFAULT_wxWITH_SUBDIRS":-$defaultval}"
fi
eval "$wx_cv_use_subdirs"
- if test "x$cache" = xyes; then
- echo "wxWITH_SUBDIRS=$wxWITH_SUBDIRS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxWITH_SUBDIRS = yes; then
else
wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_OFFICIAL_BUILD=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_official_build='wxUSE_OFFICIAL_BUILD=${'DEFAULT_wxUSE_OFFICIAL_BUILD":-$defaultval}"
fi
eval "$wx_cv_use_official_build"
- if test "x$cache" = xyes; then
- echo "wxUSE_OFFICIAL_BUILD=$wxUSE_OFFICIAL_BUILD" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_OFFICIAL_BUILD = yes; then
else
wx_cv_use_all_features='wxUSE_ALL_FEATURES=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ALL_FEATURES=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_all_features='wxUSE_ALL_FEATURES=${'DEFAULT_wxUSE_ALL_FEATURES":-$defaultval}"
fi
eval "$wx_cv_use_all_features"
- if test "x$cache" = xyes; then
- echo "wxUSE_ALL_FEATURES=$wxUSE_ALL_FEATURES" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ALL_FEATURES = yes; then
echo "${ECHO_T}$result" >&6; }
+if test "$wxUSE_ALL_FEATURES" = "no"; then
+ DEFAULT_wxUSE_MEDIACTRL=no
+fi
+
if test "$wxUSE_GUI" = "yes"; then
else
wx_cv_use_universal='wxUSE_UNIVERSAL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_UNIVERSAL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_universal='wxUSE_UNIVERSAL=${'DEFAULT_wxUSE_UNIVERSAL":-$defaultval}"
fi
eval "$wx_cv_use_universal"
- if test "x$cache" = xyes; then
- echo "wxUSE_UNIVERSAL=$wxUSE_UNIVERSAL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_UNIVERSAL = yes; then
fi
+# Check whether --with-osx_carbon was given.
+if test "${with_osx_carbon+set}" = set; then
+ withval=$with_osx_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx_cocoa was given.
+if test "${with_osx_cocoa+set}" = set; then
+ withval=$with_osx_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
# Check whether --with-mac was given.
if test "${with_mac+set}" = set; then
- withval=$with_mac; wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1
+ withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi
else
wx_cv_use_nanox='wxUSE_NANOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_NANOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_nanox='wxUSE_NANOX=${'DEFAULT_wxUSE_NANOX":-$defaultval}"
fi
eval "$wx_cv_use_nanox"
- if test "x$cache" = xyes; then
- echo "wxUSE_NANOX=$wxUSE_NANOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_NANOX = yes; then
else
wx_cv_use_gpe='wxUSE_GPE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GPE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_gpe='wxUSE_GPE=${'DEFAULT_wxUSE_GPE":-$defaultval}"
fi
eval "$wx_cv_use_gpe"
- if test "x$cache" = xyes; then
- echo "wxUSE_GPE=$wxUSE_GPE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GPE = yes; then
+{ echo "$as_me:$LINENO: checking for toolkit" >&5
+echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
+
+
+
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+ DEFAULT_DEFAULT_wxUSE_GTK=0
+ DEFAULT_DEFAULT_wxUSE_MOTIF=0
+ DEFAULT_DEFAULT_wxUSE_MSW=1
+ wxUSE_SHARED=no
+ CC=${CC:-winegcc}
+ CXX=${CXX:-wineg++}
+fi
+
+
+if test "$wxUSE_GUI" = "yes"; then
+
+ if test "$USE_BEOS" = 1; then
+ { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
+echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ if test "$TOOLKIT_GIVEN" = 1; then
+ for toolkit in $ALL_TOOLKITS; do
+ var=wxUSE_$toolkit
+ eval "value=\$${var}"
+ if test "x$value" = "xno"; then
+ eval "$var=0"
+ elif test "x$value" != "x"; then
+ eval "$var=1"
+ fi
+
+ if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+ eval "wx${toolkit}_VERSION=$value"
+ fi
+ done
+ else
+ for toolkit in $ALL_TOOLKITS; do
+ var=DEFAULT_DEFAULT_wxUSE_$toolkit
+ eval "wxUSE_$toolkit=\$${var}"
+ done
+ fi
+
+ NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+ + ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
+
+ case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+ esac
+
+ case "$NUM_TOOLKITS" in
+ 1)
+ ;;
+ 0)
+ { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
+echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: Please specify at most one toolkit" >&5
+echo "$as_me: error: Please specify at most one toolkit" >&2;}
+ { (exit 1); exit 1; }; }
+ esac
+
+ # to be removed when --disable-gtk2 isn't needed
+ if test "x$wxUSE_GTK2" = "xyes"; then
+ wxGTK_VERSION=2
+ elif test "x$wxUSE_GTK2" = "xno"; then
+ wxGTK_VERSION=1
+ fi
+
+ for toolkit in $ALL_TOOLKITS; do
+ var=wxUSE_$toolkit
+ eval "value=\$${var}"
+ if test "$value" = 1; then
+ toolkit_echo=`echo $toolkit | tr '[A-Z]' '[a-z]'`
+ { echo "$as_me:$LINENO: result: $toolkit_echo" >&5
+echo "${ECHO_T}$toolkit_echo" >&6; }
+ fi
+ done
+else
+ if test "x$host_alias" != "x"; then
+ { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
+echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
+ else
+ { echo "$as_me:$LINENO: result: base only" >&5
+echo "${ECHO_T}base only" >&6; }
+ fi
+fi
+
+wxUSE_MAC=0
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+ wxUSE_MAC=1
+fi
+
+
{ echo "$as_me:$LINENO: checking for --with-libpng" >&5
echo $ECHO_N "checking for --with-libpng... $ECHO_C" >&6; }
echo "$as_me: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBPNG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_libpng='wxUSE_LIBPNG=${'DEFAULT_wxUSE_LIBPNG":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_libpng"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBPNG=$wxUSE_LIBPNG" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_LIBPNG" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "$as_me: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBJPEG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_libjpeg='wxUSE_LIBJPEG=${'DEFAULT_wxUSE_LIBJPEG":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_libjpeg"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBJPEG=$wxUSE_LIBJPEG" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_LIBJPEG" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "$as_me: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBTIFF=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_libtiff='wxUSE_LIBTIFF=${'DEFAULT_wxUSE_LIBTIFF":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_libtiff"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBTIFF=$wxUSE_LIBTIFF" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_LIBTIFF" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "$as_me: error: Invalid value for --with-libxpm: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBXPM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_libxpm='wxUSE_LIBXPM=${'DEFAULT_wxUSE_LIBXPM":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_libxpm"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBXPM=$wxUSE_LIBXPM" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_LIBXPM" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
fi
+ withstring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$withstring" = xwithout; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+ { echo "$as_me:$LINENO: checking for --${withstring:-with}-libiconv" >&5
+echo $ECHO_N "checking for --${withstring:-with}-libiconv... $ECHO_C" >&6; }
+
+# Check whether --with-libiconv was given.
+if test "${with_libiconv+set}" = set; then
+ withval=$with_libiconv;
+ if test "$withval" = yes; then
+ wx_cv_use_libiconv='wxUSE_LIBICONV=yes'
+ else
+ wx_cv_use_libiconv='wxUSE_LIBICONV=no'
+ fi
+
+else
+
+ wx_cv_use_libiconv='wxUSE_LIBICONV=${'DEFAULT_wxUSE_LIBICONV":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_libiconv"
+
+ if test x"$withstring" = xwithout; then
+ if test $wxUSE_LIBICONV = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_LIBICONV
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
withstring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_libmspack='wxUSE_LIBMSPACK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBMSPACK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_libmspack='wxUSE_LIBMSPACK=${'DEFAULT_wxUSE_LIBMSPACK":-$defaultval}"
fi
eval "$wx_cv_use_libmspack"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBMSPACK=$wxUSE_LIBMSPACK" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBMSPACK = yes; then
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
else
wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBGNOMEPRINT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}"
fi
eval "$wx_cv_use_gnomeprint"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBGNOMEPRINT=$wxUSE_LIBGNOMEPRINT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBGNOMEPRINT = yes; then
else
wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBGNOMEVFS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}"
fi
eval "$wx_cv_use_gnomevfs"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBGNOMEVFS=$wxUSE_LIBGNOMEVFS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBGNOMEVFS = yes; then
else
wx_cv_use_hildon='wxUSE_LIBHILDON=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBHILDON=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_hildon='wxUSE_LIBHILDON=${'DEFAULT_wxUSE_LIBHILDON":-$defaultval}"
fi
eval "$wx_cv_use_hildon"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBHILDON=$wxUSE_LIBHILDON" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBHILDON = yes; then
else
wx_cv_use_opengl='wxUSE_OPENGL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_OPENGL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_opengl='wxUSE_OPENGL=${'DEFAULT_wxUSE_OPENGL":-$defaultval}"
fi
eval "$wx_cv_use_opengl"
- if test "x$cache" = xyes; then
- echo "wxUSE_OPENGL=$wxUSE_OPENGL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_OPENGL = yes; then
else
wx_cv_use_dmalloc='wxUSE_DMALLOC=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DMALLOC=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dmalloc='wxUSE_DMALLOC=${'DEFAULT_wxUSE_DMALLOC":-$defaultval}"
fi
eval "$wx_cv_use_dmalloc"
- if test "x$cache" = xyes; then
- echo "wxUSE_DMALLOC=$wxUSE_DMALLOC" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_DMALLOC = yes; then
else
wx_cv_use_sdl='wxUSE_LIBSDL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LIBSDL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_sdl='wxUSE_LIBSDL=${'DEFAULT_wxUSE_LIBSDL":-$defaultval}"
fi
eval "$wx_cv_use_sdl"
- if test "x$cache" = xyes; then
- echo "wxUSE_LIBSDL=$wxUSE_LIBSDL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$withstring" = xwithout; then
if test $wxUSE_LIBSDL = yes; then
echo "$as_me: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_REGEX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_regex='wxUSE_REGEX=${'DEFAULT_wxUSE_REGEX":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_regex"
- if test "x$cache" = xyes; then
- echo "wxUSE_REGEX=$wxUSE_REGEX" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_REGEX" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "$as_me: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ZLIB=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_zlib='wxUSE_ZLIB=${'DEFAULT_wxUSE_ZLIB":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_zlib"
- if test "x$cache" = xyes; then
- echo "wxUSE_ZLIB=$wxUSE_ZLIB" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_ZLIB" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "$as_me: error: Invalid value for --with-expat: should be yes, no, sys, or builtin" >&2;}
{ (exit 1); exit 1; }; }
fi
- cache=yes
else
- LINE=`grep "^wxUSE_EXPAT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_expat='wxUSE_EXPAT=${'DEFAULT_wxUSE_EXPAT":-$wxUSE_ALL_FEATURES}"
fi
eval "$wx_cv_use_expat"
- if test "x$cache" = xyes; then
- echo "wxUSE_EXPAT=$wxUSE_EXPAT" >> ${wx_arg_cache_file}.tmp
- fi
if test "$wxUSE_EXPAT" = yes; then
{ echo "$as_me:$LINENO: result: yes" >&5
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
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
else
wx_cv_use_shared='wxUSE_SHARED=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SHARED=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
fi
eval "$wx_cv_use_shared"
- if test "x$cache" = xyes; then
- echo "wxUSE_SHARED=$wxUSE_SHARED" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SHARED = yes; then
echo "${ECHO_T}$result" >&6; }
- enablestring=disable
- defaultval=
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
- # Check whether --enable-optimise was given.
-if test "${enable_optimise+set}" = set; then
- enableval=$enable_optimise;
- if test "$enableval" = yes; then
- wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
- else
- wx_cv_use_optimise='wxUSE_OPTIMISE=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_OPTIMISE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_optimise"
- if test "x$cache" = xyes; then
- echo "wxUSE_OPTIMISE=$wxUSE_OPTIMISE" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_OPTIMISE = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_OPTIMISE
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=
if test -z "$defaultval"; then
else
wx_cv_use_debug='wxUSE_DEBUG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DEBUG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
fi
eval "$wx_cv_use_debug"
- if test "x$cache" = xyes; then
- echo "wxUSE_DEBUG=$wxUSE_DEBUG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DEBUG = yes; then
else
wx_cv_use_stl='wxUSE_STL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
fi
eval "$wx_cv_use_stl"
- if test "x$cache" = xyes; then
- echo "wxUSE_STL=$wxUSE_STL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STL = yes; then
else
wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STD_IOSTREAM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
fi
eval "$wx_cv_use_std_iostreams"
- if test "x$cache" = xyes; then
- echo "wxUSE_STD_IOSTREAM=$wxUSE_STD_IOSTREAM" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STD_IOSTREAM = yes; then
else
wx_cv_use_std_string='wxUSE_STD_STRING=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STD_STRING=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
fi
eval "$wx_cv_use_std_string"
- if test "x$cache" = xyes; then
- echo "wxUSE_STD_STRING=$wxUSE_STD_STRING" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STD_STRING = yes; then
else
wx_cv_use_unicode='wxUSE_UNICODE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_UNICODE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
fi
eval "$wx_cv_use_unicode"
- if test "x$cache" = xyes; then
- echo "wxUSE_UNICODE=$wxUSE_UNICODE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_UNICODE = yes; then
else
wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_UNICODE_MSLU=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
fi
eval "$wx_cv_use_mslu"
- if test "x$cache" = xyes; then
- echo "wxUSE_UNICODE_MSLU=$wxUSE_UNICODE_MSLU" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_UNICODE_MSLU = yes; then
if test "${enable_utf8+set}" = set; then
enableval=$enable_utf8;
wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
- cache=yes
else
- LINE=`grep "^wxUSE_UNICODE_UTF8=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
fi
eval "$wx_cv_use_utf8"
- if test "x$cache" = xyes; then
- echo "wxUSE_UNICODE_UTF8=$wxUSE_UNICODE_UTF8" >> ${wx_arg_cache_file}.tmp
- fi
{ echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
else
wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_UNICODE_UTF8_LOCALE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
fi
eval "$wx_cv_use_utf8only"
- if test "x$cache" = xyes; then
- echo "wxUSE_UNICODE_UTF8_LOCALE=$wxUSE_UNICODE_UTF8_LOCALE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
else
wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_EXTENDED_RTTI=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
fi
eval "$wx_cv_use_extended_rtti"
- if test "x$cache" = xyes; then
- echo "wxUSE_EXTENDED_RTTI=$wxUSE_EXTENDED_RTTI" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_EXTENDED_RTTI = yes; then
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
-if test "$USE_OS2" = "1"; then
+if test "$USE_OS2" = 1; then
DEFAULT_wxUSE_OMF=no
enablestring=
else
wx_cv_use_omf='wxUSE_OMF=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_OMF=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
fi
eval "$wx_cv_use_omf"
- if test "x$cache" = xyes; then
- echo "wxUSE_OMF=$wxUSE_OMF" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_OMF = yes; then
fi
if test "$wxUSE_DEBUG" = "yes"; then
- DEFAULT_wxUSE_DEBUG_FLAG=yes
- DEFAULT_wxUSE_DEBUG_INFO=yes
- BUILD=debug
+ DEFAULT_wxUSE_DEBUG_FLAG=yes
+ DEFAULT_wxUSE_DEBUG_INFO=yes
+ BUILD=debug
elif test "$wxUSE_DEBUG" = "no"; then
- DEFAULT_wxUSE_DEBUG_FLAG=no
- DEFAULT_wxUSE_DEBUG_INFO=no
- BUILD=release
+ DEFAULT_wxUSE_DEBUG_FLAG=no
+ DEFAULT_wxUSE_DEBUG_INFO=no
+ BUILD=release
fi
else
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DEBUG_FLAG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
fi
eval "$wx_cv_use_debug_flag"
- if test "x$cache" = xyes; then
- echo "wxUSE_DEBUG_FLAG=$wxUSE_DEBUG_FLAG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DEBUG_FLAG = yes; then
else
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DEBUG_INFO=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
fi
eval "$wx_cv_use_debug_info"
- if test "x$cache" = xyes; then
- echo "wxUSE_DEBUG_INFO=$wxUSE_DEBUG_INFO" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DEBUG_INFO = yes; then
echo "${ECHO_T}$result" >&6; }
+if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
+ wxUSE_DEBUG=yes
+ BUILD=debug
+fi
+
+if test "$wxUSE_DEBUG" = "yes"; then
+ DEFAULT_wxUSE_OPTIMISE=no
+fi
+
+
+ enablestring=disable
+ defaultval=
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-optimise" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-optimise... $ECHO_C" >&6; }
+ # Check whether --enable-optimise was given.
+if test "${enable_optimise+set}" = set; then
+ enableval=$enable_optimise;
+ if test "$enableval" = yes; then
+ wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
+ else
+ wx_cv_use_optimise='wxUSE_OPTIMISE=no'
+ fi
+
+else
+
+ wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_optimise"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_OPTIMISE = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_OPTIMISE
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
enablestring=
defaultval=
if test -z "$defaultval"; then
else
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DEBUG_GDB=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
fi
eval "$wx_cv_use_debug_gdb"
- if test "x$cache" = xyes; then
- echo "wxUSE_DEBUG_GDB=$wxUSE_DEBUG_GDB" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DEBUG_GDB = yes; then
else
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DEBUG_CONTEXT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
fi
eval "$wx_cv_use_debug_cntxt"
- if test "x$cache" = xyes; then
- echo "wxUSE_DEBUG_CONTEXT=$wxUSE_DEBUG_CONTEXT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DEBUG_CONTEXT = yes; then
else
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MEM_TRACING=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
fi
eval "$wx_cv_use_mem_tracing"
- if test "x$cache" = xyes; then
- echo "wxUSE_MEM_TRACING=$wxUSE_MEM_TRACING" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MEM_TRACING = yes; then
else
wx_cv_use_profile='wxUSE_PROFILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROFILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_profile='wxUSE_PROFILE=${'DEFAULT_wxUSE_PROFILE":-$defaultval}"
fi
eval "$wx_cv_use_profile"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROFILE=$wxUSE_PROFILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROFILE = yes; then
else
wx_cv_use_no_rtti='wxUSE_NO_RTTI=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_NO_RTTI=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_no_rtti='wxUSE_NO_RTTI=${'DEFAULT_wxUSE_NO_RTTI":-$defaultval}"
fi
eval "$wx_cv_use_no_rtti"
- if test "x$cache" = xyes; then
- echo "wxUSE_NO_RTTI=$wxUSE_NO_RTTI" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_NO_RTTI = yes; then
else
wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_NO_EXCEPTIONS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=${'DEFAULT_wxUSE_NO_EXCEPTIONS":-$defaultval}"
fi
eval "$wx_cv_use_no_exceptions"
- if test "x$cache" = xyes; then
- echo "wxUSE_NO_EXCEPTIONS=$wxUSE_NO_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_NO_EXCEPTIONS = yes; then
else
wx_cv_use_permissive='wxUSE_PERMISSIVE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PERMISSIVE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_permissive='wxUSE_PERMISSIVE=${'DEFAULT_wxUSE_PERMISSIVE":-$defaultval}"
fi
eval "$wx_cv_use_permissive"
- if test "x$cache" = xyes; then
- echo "wxUSE_PERMISSIVE=$wxUSE_PERMISSIVE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PERMISSIVE = yes; then
else
wx_cv_use_no_deps='wxUSE_NO_DEPS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_NO_DEPS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_no_deps='wxUSE_NO_DEPS=${'DEFAULT_wxUSE_NO_DEPS":-$defaultval}"
fi
eval "$wx_cv_use_no_deps"
- if test "x$cache" = xyes; then
- echo "wxUSE_NO_DEPS=$wxUSE_NO_DEPS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_NO_DEPS = yes; then
else
wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_VARARG_MACROS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_vararg_macros='wxUSE_VARARG_MACROS=${'DEFAULT_wxUSE_VARARG_MACROS":-$defaultval}"
fi
eval "$wx_cv_use_vararg_macros"
- if test "x$cache" = xyes; then
- echo "wxUSE_VARARG_MACROS=$wxUSE_VARARG_MACROS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_VARARG_MACROS = yes; then
if test "${enable_universal_binary+set}" = set; then
enableval=$enable_universal_binary;
wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY='$enableval'"
- cache=yes
else
- LINE=`grep "^wxUSE_UNIVERSAL_BINARY=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
fi
eval "$wx_cv_use_universal_binary"
- if test "x$cache" = xyes; then
- echo "wxUSE_UNIVERSAL_BINARY=$wxUSE_UNIVERSAL_BINARY" >> ${wx_arg_cache_file}.tmp
- fi
{ echo "$as_me:$LINENO: result: $wxUSE_UNIVERSAL_BINARY" >&5
echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
else
wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=no'
fi
- cache=yes
else
- LINE=`grep "^WXWIN_COMPATIBILITY_2_6=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_compat26='WXWIN_COMPATIBILITY_2_6=${'DEFAULT_WXWIN_COMPATIBILITY_2_6":-$defaultval}"
fi
eval "$wx_cv_use_compat26"
- if test "x$cache" = xyes; then
- echo "WXWIN_COMPATIBILITY_2_6=$WXWIN_COMPATIBILITY_2_6" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $WXWIN_COMPATIBILITY_2_6 = yes; then
else
wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=no'
fi
- cache=yes
else
- LINE=`grep "^WXWIN_COMPATIBILITY_2_8=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_compat28='WXWIN_COMPATIBILITY_2_8=${'DEFAULT_WXWIN_COMPATIBILITY_2_8":-$defaultval}"
fi
eval "$wx_cv_use_compat28"
- if test "x$cache" = xyes; then
- echo "WXWIN_COMPATIBILITY_2_8=$WXWIN_COMPATIBILITY_2_8" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $WXWIN_COMPATIBILITY_2_8 = yes; then
echo "${ECHO_T}$result" >&6; }
+cat >>confdefs.h <<\_ACEOF
+#define wxEVENTS_COMPATIBILITY_2_8 0
+_ACEOF
+
+
enablestring=disable
defaultval=
else
wx_cv_use_rpath='wxUSE_RPATH=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_RPATH=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_rpath='wxUSE_RPATH=${'DEFAULT_wxUSE_RPATH":-$defaultval}"
fi
eval "$wx_cv_use_rpath"
- if test "x$cache" = xyes; then
- echo "wxUSE_RPATH=$wxUSE_RPATH" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_RPATH = yes; then
else
wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_OBJC_UNIQUIFYING=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_objc_uniquifying='wxUSE_OBJC_UNIQUIFYING=${'DEFAULT_wxUSE_OBJC_UNIQUIFYING":-$defaultval}"
fi
eval "$wx_cv_use_objc_uniquifying"
- if test "x$cache" = xyes; then
- echo "wxUSE_OBJC_UNIQUIFYING=$wxUSE_OBJC_UNIQUIFYING" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_OBJC_UNIQUIFYING = yes; then
else
wx_cv_use_visibility='wxUSE_VISIBILITY=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}"
fi
eval "$wx_cv_use_visibility"
- if test "x$cache" = xyes; then
- echo "wxUSE_VISIBILITY=$wxUSE_VISIBILITY" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_VISIBILITY = yes; then
else
wx_cv_use_intl='wxUSE_INTL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_INTL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_intl='wxUSE_INTL=${'DEFAULT_wxUSE_INTL":-$defaultval}"
fi
eval "$wx_cv_use_intl"
- if test "x$cache" = xyes; then
- echo "wxUSE_INTL=$wxUSE_INTL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_INTL = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-xlocale" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-xlocale... $ECHO_C" >&6; }
+ # Check whether --enable-xlocale was given.
+if test "${enable_xlocale+set}" = set; then
+ enableval=$enable_xlocale;
+ if test "$enableval" = yes; then
+ wx_cv_use_xlocale='wxUSE_XLOCALE=yes'
+ else
+ wx_cv_use_xlocale='wxUSE_XLOCALE=no'
+ fi
+
+else
+
+ wx_cv_use_xlocale='wxUSE_XLOCALE=${'DEFAULT_wxUSE_XLOCALE":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_xlocale"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_XLOCALE = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_XLOCALE
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_config='wxUSE_CONFIG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CONFIG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_config='wxUSE_CONFIG=${'DEFAULT_wxUSE_CONFIG":-$defaultval}"
fi
eval "$wx_cv_use_config"
- if test "x$cache" = xyes; then
- echo "wxUSE_CONFIG=$wxUSE_CONFIG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CONFIG = yes; then
else
wx_cv_use_protocols='wxUSE_PROTOCOL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_protocols='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
fi
eval "$wx_cv_use_protocols"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL = yes; then
else
wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
fi
eval "$wx_cv_use_ftp"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL_FTP = yes; then
else
wx_cv_use_http='wxUSE_PROTOCOL_HTTP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
fi
eval "$wx_cv_use_http"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL_HTTP = yes; then
else
wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fileproto='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
fi
eval "$wx_cv_use_fileproto"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL_FILE = yes; then
else
wx_cv_use_sockets='wxUSE_SOCKETS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SOCKETS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_sockets='wxUSE_SOCKETS=${'DEFAULT_wxUSE_SOCKETS":-$defaultval}"
fi
eval "$wx_cv_use_sockets"
- if test "x$cache" = xyes; then
- echo "wxUSE_SOCKETS=$wxUSE_SOCKETS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SOCKETS = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ipv6" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ipv6... $ECHO_C" >&6; }
+ # Check whether --enable-ipv6 was given.
+if test "${enable_ipv6+set}" = set; then
+ enableval=$enable_ipv6;
+ if test "$enableval" = yes; then
+ wx_cv_use_ipv6='wxUSE_IPV6=yes'
+ else
+ wx_cv_use_ipv6='wxUSE_IPV6=no'
+ fi
+
+else
+
+ wx_cv_use_ipv6='wxUSE_IPV6=${'DEFAULT_wxUSE_IPV6":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_ipv6"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_IPV6 = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_IPV6
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_ole='wxUSE_OLE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_OLE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_ole='wxUSE_OLE=${'DEFAULT_wxUSE_OLE":-$defaultval}"
fi
eval "$wx_cv_use_ole"
- if test "x$cache" = xyes; then
- echo "wxUSE_OLE=$wxUSE_OLE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_OLE = yes; then
else
wx_cv_use_dataobj='wxUSE_DATAOBJ=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DATAOBJ=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dataobj='wxUSE_DATAOBJ=${'DEFAULT_wxUSE_DATAOBJ":-$defaultval}"
fi
eval "$wx_cv_use_dataobj"
- if test "x$cache" = xyes; then
- echo "wxUSE_DATAOBJ=$wxUSE_DATAOBJ" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DATAOBJ = yes; then
else
wx_cv_use_ipc='wxUSE_IPC=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_IPC=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_ipc='wxUSE_IPC=${'DEFAULT_wxUSE_IPC":-$defaultval}"
fi
eval "$wx_cv_use_ipc"
- if test "x$cache" = xyes; then
- echo "wxUSE_IPC=$wxUSE_IPC" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_IPC = yes; then
else
wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CONSOLE_EVENTLOOP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_baseevtloop='wxUSE_CONSOLE_EVENTLOOP=${'DEFAULT_wxUSE_CONSOLE_EVENTLOOP":-$defaultval}"
fi
eval "$wx_cv_use_baseevtloop"
- if test "x$cache" = xyes; then
- echo "wxUSE_CONSOLE_EVENTLOOP=$wxUSE_CONSOLE_EVENTLOOP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
else
wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_EPOLL_DISPATCHER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_epollloop='wxUSE_EPOLL_DISPATCHER=${'DEFAULT_wxUSE_EPOLL_DISPATCHER":-$defaultval}"
fi
eval "$wx_cv_use_epollloop"
- if test "x$cache" = xyes; then
- echo "wxUSE_EPOLL_DISPATCHER=$wxUSE_EPOLL_DISPATCHER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_EPOLL_DISPATCHER = yes; then
else
wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SELECT_DISPATCHER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_selectloop='wxUSE_SELECT_DISPATCHER=${'DEFAULT_wxUSE_SELECT_DISPATCHER":-$defaultval}"
fi
eval "$wx_cv_use_selectloop"
- if test "x$cache" = xyes; then
- echo "wxUSE_SELECT_DISPATCHER=$wxUSE_SELECT_DISPATCHER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SELECT_DISPATCHER = yes; then
else
wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_APPLE_IEEE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_apple_ieee='wxUSE_APPLE_IEEE=${'DEFAULT_wxUSE_APPLE_IEEE":-$defaultval}"
fi
eval "$wx_cv_use_apple_ieee"
- if test "x$cache" = xyes; then
- echo "wxUSE_APPLE_IEEE=$wxUSE_APPLE_IEEE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_APPLE_IEEE = yes; then
else
wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ARCHIVE_STREAMS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_arcstream='wxUSE_ARCHIVE_STREAMS=${'DEFAULT_wxUSE_ARCHIVE_STREAMS":-$defaultval}"
fi
eval "$wx_cv_use_arcstream"
- if test "x$cache" = xyes; then
- echo "wxUSE_ARCHIVE_STREAMS=$wxUSE_ARCHIVE_STREAMS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ARCHIVE_STREAMS = yes; then
else
wx_cv_use_base64='wxUSE_BASE64=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_BASE64=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_base64='wxUSE_BASE64=${'DEFAULT_wxUSE_BASE64":-$defaultval}"
fi
eval "$wx_cv_use_base64"
- if test "x$cache" = xyes; then
- echo "wxUSE_BASE64=$wxUSE_BASE64" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_BASE64 = yes; then
else
wx_cv_use_backtrace='wxUSE_STACKWALKER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STACKWALKER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_backtrace='wxUSE_STACKWALKER=${'DEFAULT_wxUSE_STACKWALKER":-$defaultval}"
fi
eval "$wx_cv_use_backtrace"
- if test "x$cache" = xyes; then
- echo "wxUSE_STACKWALKER=$wxUSE_STACKWALKER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STACKWALKER = yes; then
else
wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ON_FATAL_EXCEPTION=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=${'DEFAULT_wxUSE_ON_FATAL_EXCEPTION":-$defaultval}"
fi
eval "$wx_cv_use_catch_segvs"
- if test "x$cache" = xyes; then
- echo "wxUSE_ON_FATAL_EXCEPTION=$wxUSE_ON_FATAL_EXCEPTION" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
else
wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CMDLINE_PARSER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_cmdline='wxUSE_CMDLINE_PARSER=${'DEFAULT_wxUSE_CMDLINE_PARSER":-$defaultval}"
fi
eval "$wx_cv_use_cmdline"
- if test "x$cache" = xyes; then
- echo "wxUSE_CMDLINE_PARSER=$wxUSE_CMDLINE_PARSER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CMDLINE_PARSER = yes; then
else
wx_cv_use_datetime='wxUSE_DATETIME=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DATETIME=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_datetime='wxUSE_DATETIME=${'DEFAULT_wxUSE_DATETIME":-$defaultval}"
fi
eval "$wx_cv_use_datetime"
- if test "x$cache" = xyes; then
- echo "wxUSE_DATETIME=$wxUSE_DATETIME" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DATETIME = yes; then
else
wx_cv_use_debugreport='wxUSE_DEBUGREPORT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DEBUGREPORT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_debugreport='wxUSE_DEBUGREPORT=${'DEFAULT_wxUSE_DEBUGREPORT":-$defaultval}"
fi
eval "$wx_cv_use_debugreport"
- if test "x$cache" = xyes; then
- echo "wxUSE_DEBUGREPORT=$wxUSE_DEBUGREPORT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DEBUGREPORT = yes; then
else
wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DIALUP_MANAGER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dialupman='wxUSE_DIALUP_MANAGER=${'DEFAULT_wxUSE_DIALUP_MANAGER":-$defaultval}"
fi
eval "$wx_cv_use_dialupman"
- if test "x$cache" = xyes; then
- echo "wxUSE_DIALUP_MANAGER=$wxUSE_DIALUP_MANAGER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DIALUP_MANAGER = yes; then
else
wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DYNLIB_CLASS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dynlib='wxUSE_DYNLIB_CLASS=${'DEFAULT_wxUSE_DYNLIB_CLASS":-$defaultval}"
fi
eval "$wx_cv_use_dynlib"
- if test "x$cache" = xyes; then
- echo "wxUSE_DYNLIB_CLASS=$wxUSE_DYNLIB_CLASS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DYNLIB_CLASS = yes; then
else
wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DYNAMIC_LOADER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dynamicloader='wxUSE_DYNAMIC_LOADER=${'DEFAULT_wxUSE_DYNAMIC_LOADER":-$defaultval}"
fi
eval "$wx_cv_use_dynamicloader"
- if test "x$cache" = xyes; then
- echo "wxUSE_DYNAMIC_LOADER=$wxUSE_DYNAMIC_LOADER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DYNAMIC_LOADER = yes; then
else
wx_cv_use_exceptions='wxUSE_EXCEPTIONS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_EXCEPTIONS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_exceptions='wxUSE_EXCEPTIONS=${'DEFAULT_wxUSE_EXCEPTIONS":-$defaultval}"
fi
eval "$wx_cv_use_exceptions"
- if test "x$cache" = xyes; then
- echo "wxUSE_EXCEPTIONS=$wxUSE_EXCEPTIONS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_EXCEPTIONS = yes; then
else
wx_cv_use_ffile='wxUSE_FFILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FFILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_ffile='wxUSE_FFILE=${'DEFAULT_wxUSE_FFILE":-$defaultval}"
fi
eval "$wx_cv_use_ffile"
- if test "x$cache" = xyes; then
- echo "wxUSE_FFILE=$wxUSE_FFILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FFILE = yes; then
else
wx_cv_use_file='wxUSE_FILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_file='wxUSE_FILE=${'DEFAULT_wxUSE_FILE":-$defaultval}"
fi
eval "$wx_cv_use_file"
- if test "x$cache" = xyes; then
- echo "wxUSE_FILE=$wxUSE_FILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FILE = yes; then
else
wx_cv_use_filesystem='wxUSE_FILESYSTEM=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FILESYSTEM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_filesystem='wxUSE_FILESYSTEM=${'DEFAULT_wxUSE_FILESYSTEM":-$defaultval}"
fi
eval "$wx_cv_use_filesystem"
- if test "x$cache" = xyes; then
- echo "wxUSE_FILESYSTEM=$wxUSE_FILESYSTEM" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FILESYSTEM = yes; then
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
else
wx_cv_use_fontmap='wxUSE_FONTMAP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FONTMAP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fontmap='wxUSE_FONTMAP=${'DEFAULT_wxUSE_FONTMAP":-$defaultval}"
fi
eval "$wx_cv_use_fontmap"
- if test "x$cache" = xyes; then
- echo "wxUSE_FONTMAP=$wxUSE_FONTMAP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FONTMAP = yes; then
else
wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FS_ARCHIVE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fs_archive='wxUSE_FS_ARCHIVE=${'DEFAULT_wxUSE_FS_ARCHIVE":-$defaultval}"
fi
eval "$wx_cv_use_fs_archive"
- if test "x$cache" = xyes; then
- echo "wxUSE_FS_ARCHIVE=$wxUSE_FS_ARCHIVE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FS_ARCHIVE = yes; then
else
wx_cv_use_fs_inet='wxUSE_FS_INET=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FS_INET=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fs_inet='wxUSE_FS_INET=${'DEFAULT_wxUSE_FS_INET":-$defaultval}"
fi
eval "$wx_cv_use_fs_inet"
- if test "x$cache" = xyes; then
- echo "wxUSE_FS_INET=$wxUSE_FS_INET" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FS_INET = yes; then
else
wx_cv_use_fs_zip='wxUSE_FS_ZIP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FS_ZIP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fs_zip='wxUSE_FS_ZIP=${'DEFAULT_wxUSE_FS_ZIP":-$defaultval}"
fi
eval "$wx_cv_use_fs_zip"
- if test "x$cache" = xyes; then
- echo "wxUSE_FS_ZIP=$wxUSE_FS_ZIP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FS_ZIP = yes; then
else
wx_cv_use_geometry='wxUSE_GEOMETRY=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GEOMETRY=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_geometry='wxUSE_GEOMETRY=${'DEFAULT_wxUSE_GEOMETRY":-$defaultval}"
fi
eval "$wx_cv_use_geometry"
- if test "x$cache" = xyes; then
- echo "wxUSE_GEOMETRY=$wxUSE_GEOMETRY" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GEOMETRY = yes; then
else
wx_cv_use_log='wxUSE_LOG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LOG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_log='wxUSE_LOG=${'DEFAULT_wxUSE_LOG":-$defaultval}"
fi
eval "$wx_cv_use_log"
- if test "x$cache" = xyes; then
- echo "wxUSE_LOG=$wxUSE_LOG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_LOG = yes; then
else
wx_cv_use_longlong='wxUSE_LONGLONG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LONGLONG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_longlong='wxUSE_LONGLONG=${'DEFAULT_wxUSE_LONGLONG":-$defaultval}"
fi
eval "$wx_cv_use_longlong"
- if test "x$cache" = xyes; then
- echo "wxUSE_LONGLONG=$wxUSE_LONGLONG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_LONGLONG = yes; then
else
wx_cv_use_mimetype='wxUSE_MIMETYPE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MIMETYPE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_mimetype='wxUSE_MIMETYPE=${'DEFAULT_wxUSE_MIMETYPE":-$defaultval}"
fi
eval "$wx_cv_use_mimetype"
- if test "x$cache" = xyes; then
- echo "wxUSE_MIMETYPE=$wxUSE_MIMETYPE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MIMETYPE = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
+ # Check whether --enable-printfposparam was given.
+if test "${enable_printfposparam+set}" = set; then
+ enableval=$enable_printfposparam;
+ if test "$enableval" = yes; then
+ wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+ else
+ wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+ fi
+
+else
+
+ wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_printfposparam"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_PRINTF_POS_PARAMS = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_PRINTF_POS_PARAMS
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SNGLINST_CHECKER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=${'DEFAULT_wxUSE_SNGLINST_CHECKER":-$defaultval}"
fi
eval "$wx_cv_use_snglinst"
- if test "x$cache" = xyes; then
- echo "wxUSE_SNGLINST_CHECKER=$wxUSE_SNGLINST_CHECKER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SNGLINST_CHECKER = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
+ # Check whether --enable-sound was given.
+if test "${enable_sound+set}" = set; then
+ enableval=$enable_sound;
+ if test "$enableval" = yes; then
+ wx_cv_use_sound='wxUSE_SOUND=yes'
+ else
+ wx_cv_use_sound='wxUSE_SOUND=no'
+ fi
+
+else
+
+ wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_sound"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_SOUND = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_SOUND
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_stdpaths='wxUSE_STDPATHS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STDPATHS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_stdpaths='wxUSE_STDPATHS=${'DEFAULT_wxUSE_STDPATHS":-$defaultval}"
fi
eval "$wx_cv_use_stdpaths"
- if test "x$cache" = xyes; then
- echo "wxUSE_STDPATHS=$wxUSE_STDPATHS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STDPATHS = yes; then
else
wx_cv_use_stopwatch='wxUSE_STOPWATCH=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STOPWATCH=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_stopwatch='wxUSE_STOPWATCH=${'DEFAULT_wxUSE_STOPWATCH":-$defaultval}"
fi
eval "$wx_cv_use_stopwatch"
- if test "x$cache" = xyes; then
- echo "wxUSE_STOPWATCH=$wxUSE_STOPWATCH" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STOPWATCH = yes; then
else
wx_cv_use_streams='wxUSE_STREAMS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STREAMS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_streams='wxUSE_STREAMS=${'DEFAULT_wxUSE_STREAMS":-$defaultval}"
fi
eval "$wx_cv_use_streams"
- if test "x$cache" = xyes; then
- echo "wxUSE_STREAMS=$wxUSE_STREAMS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STREAMS = yes; then
else
wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SYSTEM_OPTIONS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
fi
eval "$wx_cv_use_system_options"
- if test "x$cache" = xyes; then
- echo "wxUSE_SYSTEM_OPTIONS=$wxUSE_SYSTEM_OPTIONS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SYSTEM_OPTIONS = yes; then
else
wx_cv_use_tarstream='wxUSE_TARSTREAM=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TARSTREAM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_tarstream='wxUSE_TARSTREAM=${'DEFAULT_wxUSE_TARSTREAM":-$defaultval}"
fi
eval "$wx_cv_use_tarstream"
- if test "x$cache" = xyes; then
- echo "wxUSE_TARSTREAM=$wxUSE_TARSTREAM" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TARSTREAM = yes; then
else
wx_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TEXTBUFFER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_textbuf='wxUSE_TEXTBUFFER=${'DEFAULT_wxUSE_TEXTBUFFER":-$defaultval}"
fi
eval "$wx_cv_use_textbuf"
- if test "x$cache" = xyes; then
- echo "wxUSE_TEXTBUFFER=$wxUSE_TEXTBUFFER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TEXTBUFFER = yes; then
else
wx_cv_use_textfile='wxUSE_TEXTFILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TEXTFILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_textfile='wxUSE_TEXTFILE=${'DEFAULT_wxUSE_TEXTFILE":-$defaultval}"
fi
eval "$wx_cv_use_textfile"
- if test "x$cache" = xyes; then
- echo "wxUSE_TEXTFILE=$wxUSE_TEXTFILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TEXTFILE = yes; then
else
wx_cv_use_timer='wxUSE_TIMER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TIMER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_timer='wxUSE_TIMER=${'DEFAULT_wxUSE_TIMER":-$defaultval}"
fi
eval "$wx_cv_use_timer"
- if test "x$cache" = xyes; then
- echo "wxUSE_TIMER=$wxUSE_TIMER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TIMER = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sound" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-sound... $ECHO_C" >&6; }
- # Check whether --enable-sound was given.
-if test "${enable_sound+set}" = set; then
- enableval=$enable_sound;
- if test "$enableval" = yes; then
- wx_cv_use_sound='wxUSE_SOUND=yes'
- else
- wx_cv_use_sound='wxUSE_SOUND=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_SOUND=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_sound='wxUSE_SOUND=${'DEFAULT_wxUSE_SOUND":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_sound"
- if test "x$cache" = xyes; then
- echo "wxUSE_SOUND=$wxUSE_SOUND" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_SOUND = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_SOUND
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
- enablestring=
- defaultval=$wxUSE_ALL_FEATURES
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
- # Check whether --enable-mediactrl was given.
-if test "${enable_mediactrl+set}" = set; then
- enableval=$enable_mediactrl;
- if test "$enableval" = yes; then
- wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
- else
- wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_MEDIACTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_mediactrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_MEDIACTRL=$wxUSE_MEDIACTRL" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_MEDIACTRL = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_MEDIACTRL
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
- enablestring=
- defaultval=$wxUSE_ALL_FEATURES
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
- # Check whether --enable-gstreamer8 was given.
-if test "${enable_gstreamer8+set}" = set; then
- enableval=$enable_gstreamer8;
- if test "$enableval" = yes; then
- wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
- else
- wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_GSTREAMER8=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_gstreamer8"
- if test "x$cache" = xyes; then
- echo "wxUSE_GSTREAMER8=$wxUSE_GSTREAMER8" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_GSTREAMER8 = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_GSTREAMER8
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
- enablestring=
- defaultval=$wxUSE_ALL_FEATURES
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printfposparam" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-printfposparam... $ECHO_C" >&6; }
- # Check whether --enable-printfposparam was given.
-if test "${enable_printfposparam+set}" = set; then
- enableval=$enable_printfposparam;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
+ # Check whether --enable-variant was given.
+if test "${enable_variant+set}" = set; then
+ enableval=$enable_variant;
if test "$enableval" = yes; then
- wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=yes'
+ wx_cv_use_variant='wxUSE_VARIANT=yes'
else
- wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=no'
+ wx_cv_use_variant='wxUSE_VARIANT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PRINTF_POS_PARAMS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_printfposparam='wxUSE_PRINTF_POS_PARAMS=${'DEFAULT_wxUSE_PRINTF_POS_PARAMS":-$defaultval}"
+ wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
fi
- eval "$wx_cv_use_printfposparam"
- if test "x$cache" = xyes; then
- echo "wxUSE_PRINTF_POS_PARAMS=$wxUSE_PRINTF_POS_PARAMS" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_variant"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PRINTF_POS_PARAMS = yes; then
+ if test $wxUSE_VARIANT = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_PRINTF_POS_PARAMS
+ result=$wxUSE_VARIANT
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ZIPSTREAM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_zipstream='wxUSE_ZIPSTREAM=${'DEFAULT_wxUSE_ZIPSTREAM":-$defaultval}"
fi
eval "$wx_cv_use_zipstream"
- if test "x$cache" = xyes; then
- echo "wxUSE_ZIPSTREAM=$wxUSE_ZIPSTREAM" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ZIPSTREAM = yes; then
else
wx_cv_use_url='wxUSE_URL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_URL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_url='wxUSE_URL=${'DEFAULT_wxUSE_URL":-$defaultval}"
fi
eval "$wx_cv_use_url"
- if test "x$cache" = xyes; then
- echo "wxUSE_URL=$wxUSE_URL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_URL = yes; then
echo "${ECHO_T}$result" >&6; }
- enablestring=
- defaultval=$wxUSE_ALL_FEATURES
- if test -z "$defaultval"; then
- if test x"$enablestring" = xdisable; then
- defaultval=yes
- else
- defaultval=no
- fi
- fi
-
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-variant" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-variant... $ECHO_C" >&6; }
- # Check whether --enable-variant was given.
-if test "${enable_variant+set}" = set; then
- enableval=$enable_variant;
- if test "$enableval" = yes; then
- wx_cv_use_variant='wxUSE_VARIANT=yes'
- else
- wx_cv_use_variant='wxUSE_VARIANT=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_VARIANT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_variant='wxUSE_VARIANT=${'DEFAULT_wxUSE_VARIANT":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_variant"
- if test "x$cache" = xyes; then
- echo "wxUSE_VARIANT=$wxUSE_VARIANT" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_VARIANT = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_VARIANT
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_protocol='wxUSE_PROTOCOL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_protocol='wxUSE_PROTOCOL=${'DEFAULT_wxUSE_PROTOCOL":-$defaultval}"
fi
eval "$wx_cv_use_protocol"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL=$wxUSE_PROTOCOL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL = yes; then
else
wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL_HTTP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_protocol_http='wxUSE_PROTOCOL_HTTP=${'DEFAULT_wxUSE_PROTOCOL_HTTP":-$defaultval}"
fi
eval "$wx_cv_use_protocol_http"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL_HTTP=$wxUSE_PROTOCOL_HTTP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL_HTTP = yes; then
else
wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL_FTP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_protocol_ftp='wxUSE_PROTOCOL_FTP=${'DEFAULT_wxUSE_PROTOCOL_FTP":-$defaultval}"
fi
eval "$wx_cv_use_protocol_ftp"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL_FTP=$wxUSE_PROTOCOL_FTP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL_FTP = yes; then
else
wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROTOCOL_FILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_protocol_file='wxUSE_PROTOCOL_FILE=${'DEFAULT_wxUSE_PROTOCOL_FILE":-$defaultval}"
fi
eval "$wx_cv_use_protocol_file"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROTOCOL_FILE=$wxUSE_PROTOCOL_FILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROTOCOL_FILE = yes; then
else
wx_cv_use_threads='wxUSE_THREADS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_THREADS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_threads='wxUSE_THREADS=${'DEFAULT_wxUSE_THREADS":-$defaultval}"
fi
eval "$wx_cv_use_threads"
- if test "x$cache" = xyes; then
- echo "wxUSE_THREADS=$wxUSE_THREADS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_THREADS = yes; then
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
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
else
wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DOC_VIEW_ARCHITECTURE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=${'DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE":-$defaultval}"
fi
eval "$wx_cv_use_docview"
- if test "x$cache" = xyes; then
- echo "wxUSE_DOC_VIEW_ARCHITECTURE=$wxUSE_DOC_VIEW_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
else
wx_cv_use_help='wxUSE_HELP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_HELP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_help='wxUSE_HELP=${'DEFAULT_wxUSE_HELP":-$defaultval}"
fi
eval "$wx_cv_use_help"
- if test "x$cache" = xyes; then
- echo "wxUSE_HELP=$wxUSE_HELP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_HELP = yes; then
else
wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MS_HTML_HELP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=${'DEFAULT_wxUSE_MS_HTML_HELP":-$defaultval}"
fi
eval "$wx_cv_use_mshtmlhelp"
- if test "x$cache" = xyes; then
- echo "wxUSE_MS_HTML_HELP=$wxUSE_MS_HTML_HELP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MS_HTML_HELP = yes; then
else
wx_cv_use_html='wxUSE_HTML=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_HTML=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_html='wxUSE_HTML=${'DEFAULT_wxUSE_HTML":-$defaultval}"
fi
eval "$wx_cv_use_html"
- if test "x$cache" = xyes; then
- echo "wxUSE_HTML=$wxUSE_HTML" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_HTML = yes; then
else
wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_WXHTML_HELP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_htmlhelp='wxUSE_WXHTML_HELP=${'DEFAULT_wxUSE_WXHTML_HELP":-$defaultval}"
fi
eval "$wx_cv_use_htmlhelp"
- if test "x$cache" = xyes; then
- echo "wxUSE_WXHTML_HELP=$wxUSE_WXHTML_HELP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_WXHTML_HELP = yes; then
else
wx_cv_use_xrc='wxUSE_XRC=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_XRC=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_xrc='wxUSE_XRC=${'DEFAULT_wxUSE_XRC":-$defaultval}"
fi
eval "$wx_cv_use_xrc"
- if test "x$cache" = xyes; then
- echo "wxUSE_XRC=$wxUSE_XRC" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_XRC = yes; then
else
wx_cv_use_aui='wxUSE_AUI=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_AUI=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_aui='wxUSE_AUI=${'DEFAULT_wxUSE_AUI":-$defaultval}"
fi
eval "$wx_cv_use_aui"
- if test "x$cache" = xyes; then
- echo "wxUSE_AUI=$wxUSE_AUI" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_AUI = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-propgrid" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-propgrid... $ECHO_C" >&6; }
+ # Check whether --enable-propgrid was given.
+if test "${enable_propgrid+set}" = set; then
+ enableval=$enable_propgrid;
+ if test "$enableval" = yes; then
+ wx_cv_use_propgrid='wxUSE_PROPGRID=yes'
+ else
+ wx_cv_use_propgrid='wxUSE_PROPGRID=no'
+ fi
+
+else
+
+ wx_cv_use_propgrid='wxUSE_PROPGRID=${'DEFAULT_wxUSE_PROPGRID":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_propgrid"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_PROPGRID = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_PROPGRID
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_stc='wxUSE_STC=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STC=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_stc='wxUSE_STC=${'DEFAULT_wxUSE_STC":-$defaultval}"
fi
eval "$wx_cv_use_stc"
- if test "x$cache" = xyes; then
- echo "wxUSE_STC=$wxUSE_STC" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STC = yes; then
else
wx_cv_use_constraints='wxUSE_CONSTRAINTS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CONSTRAINTS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_constraints='wxUSE_CONSTRAINTS=${'DEFAULT_wxUSE_CONSTRAINTS":-$defaultval}"
fi
eval "$wx_cv_use_constraints"
- if test "x$cache" = xyes; then
- echo "wxUSE_CONSTRAINTS=$wxUSE_CONSTRAINTS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CONSTRAINTS = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
- # Check whether --enable-printarch was given.
-if test "${enable_printarch+set}" = set; then
- enableval=$enable_printarch;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
+ # Check whether --enable-loggui was given.
+if test "${enable_loggui+set}" = set; then
+ enableval=$enable_loggui;
if test "$enableval" = yes; then
- wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+ wx_cv_use_loggui='wxUSE_LOGGUI=yes'
else
- wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+ wx_cv_use_loggui='wxUSE_LOGGUI=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PRINTING_ARCHITECTURE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
+ wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
fi
- eval "$wx_cv_use_printarch"
- if test "x$cache" = xyes; then
- echo "wxUSE_PRINTING_ARCHITECTURE=$wxUSE_PRINTING_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_loggui"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
+ if test $wxUSE_LOGGUI = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_PRINTING_ARCHITECTURE
+ result=$wxUSE_LOGGUI
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
- # Check whether --enable-mdi was given.
-if test "${enable_mdi+set}" = set; then
- enableval=$enable_mdi;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
+ # Check whether --enable-logwin was given.
+if test "${enable_logwin+set}" = set; then
+ enableval=$enable_logwin;
if test "$enableval" = yes; then
- wx_cv_use_mdi='wxUSE_MDI=yes'
+ wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
else
- wx_cv_use_mdi='wxUSE_MDI=no'
+ wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MDI=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
+ wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
fi
- eval "$wx_cv_use_mdi"
- if test "x$cache" = xyes; then
- echo "wxUSE_MDI=$wxUSE_MDI" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_logwin"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MDI = yes; then
+ if test $wxUSE_LOGWINDOW = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_MDI
+ result=$wxUSE_LOGWINDOW
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
- # Check whether --enable-mdidoc was given.
-if test "${enable_mdidoc+set}" = set; then
- enableval=$enable_mdidoc;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; }
+ # Check whether --enable-logdialog was given.
+if test "${enable_logdialog+set}" = set; then
+ enableval=$enable_logdialog;
if test "$enableval" = yes; then
- wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
+ wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
else
- wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
+ wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MDI_ARCHITECTURE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
+ wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
fi
- eval "$wx_cv_use_mdidoc"
- if test "x$cache" = xyes; then
- echo "wxUSE_MDI_ARCHITECTURE=$wxUSE_MDI_ARCHITECTURE" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_logdialog"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MDI_ARCHITECTURE = yes; then
+ if test $wxUSE_LOGDIALOG = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_MDI_ARCHITECTURE
+ result=$wxUSE_LOGDIALOG
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-loggui" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-loggui... $ECHO_C" >&6; }
- # Check whether --enable-loggui was given.
-if test "${enable_loggui+set}" = set; then
- enableval=$enable_loggui;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdi" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mdi... $ECHO_C" >&6; }
+ # Check whether --enable-mdi was given.
+if test "${enable_mdi+set}" = set; then
+ enableval=$enable_mdi;
if test "$enableval" = yes; then
- wx_cv_use_loggui='wxUSE_LOGGUI=yes'
+ wx_cv_use_mdi='wxUSE_MDI=yes'
else
- wx_cv_use_loggui='wxUSE_LOGGUI=no'
+ wx_cv_use_mdi='wxUSE_MDI=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LOGGUI=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_loggui='wxUSE_LOGGUI=${'DEFAULT_wxUSE_LOGGUI":-$defaultval}"
+ wx_cv_use_mdi='wxUSE_MDI=${'DEFAULT_wxUSE_MDI":-$defaultval}"
fi
- eval "$wx_cv_use_loggui"
- if test "x$cache" = xyes; then
- echo "wxUSE_LOGGUI=$wxUSE_LOGGUI" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_mdi"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOGGUI = yes; then
+ if test $wxUSE_MDI = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_LOGGUI
+ result=$wxUSE_MDI
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logwin" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-logwin... $ECHO_C" >&6; }
- # Check whether --enable-logwin was given.
-if test "${enable_logwin+set}" = set; then
- enableval=$enable_logwin;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mdidoc" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mdidoc... $ECHO_C" >&6; }
+ # Check whether --enable-mdidoc was given.
+if test "${enable_mdidoc+set}" = set; then
+ enableval=$enable_mdidoc;
if test "$enableval" = yes; then
- wx_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+ wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=yes'
else
- wx_cv_use_logwin='wxUSE_LOGWINDOW=no'
+ wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LOGWINDOW=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_logwin='wxUSE_LOGWINDOW=${'DEFAULT_wxUSE_LOGWINDOW":-$defaultval}"
+ wx_cv_use_mdidoc='wxUSE_MDI_ARCHITECTURE=${'DEFAULT_wxUSE_MDI_ARCHITECTURE":-$defaultval}"
fi
- eval "$wx_cv_use_logwin"
- if test "x$cache" = xyes; then
- echo "wxUSE_LOGWINDOW=$wxUSE_LOGWINDOW" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_mdidoc"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOGWINDOW = yes; then
+ if test $wxUSE_MDI_ARCHITECTURE = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_LOGWINDOW
+ result=$wxUSE_MDI_ARCHITECTURE
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-logdialog" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-logdialog... $ECHO_C" >&6; }
- # Check whether --enable-logdialog was given.
-if test "${enable_logdialog+set}" = set; then
- enableval=$enable_logdialog;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mediactrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mediactrl... $ECHO_C" >&6; }
+ # Check whether --enable-mediactrl was given.
+if test "${enable_mediactrl+set}" = set; then
+ enableval=$enable_mediactrl;
if test "$enableval" = yes; then
- wx_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
+ wx_cv_use_mediactrl='wxUSE_MEDIACTRL=yes'
else
- wx_cv_use_logdialog='wxUSE_LOGDIALOG=no'
+ wx_cv_use_mediactrl='wxUSE_MEDIACTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LOGDIALOG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
+ wx_cv_use_mediactrl='wxUSE_MEDIACTRL=${'DEFAULT_wxUSE_MEDIACTRL":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_mediactrl"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_MEDIACTRL = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_MEDIACTRL
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gstreamer8" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gstreamer8... $ECHO_C" >&6; }
+ # Check whether --enable-gstreamer8 was given.
+if test "${enable_gstreamer8+set}" = set; then
+ enableval=$enable_gstreamer8;
+ if test "$enableval" = yes; then
+ wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=yes'
else
- cache=no
+ wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=no'
fi
- wx_cv_use_logdialog='wxUSE_LOGDIALOG=${'DEFAULT_wxUSE_LOGDIALOG":-$defaultval}"
+else
+
+ wx_cv_use_gstreamer8='wxUSE_GSTREAMER8=${'DEFAULT_wxUSE_GSTREAMER8":-$defaultval}"
fi
- eval "$wx_cv_use_logdialog"
- if test "x$cache" = xyes; then
- echo "wxUSE_LOGDIALOG=$wxUSE_LOGDIALOG" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_gstreamer8"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOGDIALOG = yes; then
+ if test $wxUSE_GSTREAMER8 = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_LOGDIALOG
+ result=$wxUSE_GSTREAMER8
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_webkit='wxUSE_WEBKIT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_WEBKIT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}"
fi
eval "$wx_cv_use_webkit"
- if test "x$cache" = xyes; then
- echo "wxUSE_WEBKIT=$wxUSE_WEBKIT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_WEBKIT = yes; then
else
wx_cv_use_richtext='wxUSE_RICHTEXT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_RICHTEXT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_richtext='wxUSE_RICHTEXT=${'DEFAULT_wxUSE_RICHTEXT":-$defaultval}"
fi
eval "$wx_cv_use_richtext"
- if test "x$cache" = xyes; then
- echo "wxUSE_RICHTEXT=$wxUSE_RICHTEXT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_RICHTEXT = yes; then
else
wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GRAPHICS_CONTEXT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
fi
eval "$wx_cv_use_graphics_ctx"
- if test "x$cache" = xyes; then
- echo "wxUSE_GRAPHICS_CONTEXT=$wxUSE_GRAPHICS_CONTEXT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GRAPHICS_CONTEXT = yes; then
else
wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_POSTSCRIPT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
fi
eval "$wx_cv_use_postscript"
- if test "x$cache" = xyes; then
- echo "wxUSE_POSTSCRIPT=$wxUSE_POSTSCRIPT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_POSTSCRIPT = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-printarch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-printarch... $ECHO_C" >&6; }
+ # Check whether --enable-printarch was given.
+if test "${enable_printarch+set}" = set; then
+ enableval=$enable_printarch;
+ if test "$enableval" = yes; then
+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+ else
+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+ fi
+
+else
+
+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_printarch"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_PRINTING_ARCHITECTURE
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_svg='wxUSE_SVG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SVG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
fi
eval "$wx_cv_use_svg"
- if test "x$cache" = xyes; then
- echo "wxUSE_SVG=$wxUSE_SVG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SVG = yes; then
else
wx_cv_use_clipboard='wxUSE_CLIPBOARD=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CLIPBOARD=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_clipboard='wxUSE_CLIPBOARD=${'DEFAULT_wxUSE_CLIPBOARD":-$defaultval}"
fi
eval "$wx_cv_use_clipboard"
- if test "x$cache" = xyes; then
- echo "wxUSE_CLIPBOARD=$wxUSE_CLIPBOARD" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CLIPBOARD = yes; then
else
wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DRAG_AND_DROP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dnd='wxUSE_DRAG_AND_DROP=${'DEFAULT_wxUSE_DRAG_AND_DROP":-$defaultval}"
fi
eval "$wx_cv_use_dnd"
- if test "x$cache" = xyes; then
- echo "wxUSE_DRAG_AND_DROP=$wxUSE_DRAG_AND_DROP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DRAG_AND_DROP = yes; then
else
wx_cv_use_metafile='wxUSE_METAFILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
fi
eval "$wx_cv_use_metafile"
- if test "x$cache" = xyes; then
- echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_METAFILE = yes; then
else
wx_cv_use_controls='wxUSE_CONTROLS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CONTROLS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_controls='wxUSE_CONTROLS=${'DEFAULT_wxUSE_CONTROLS":-$defaultval}"
fi
eval "$wx_cv_use_controls"
- if test "x$cache" = xyes; then
- echo "wxUSE_CONTROLS=$wxUSE_CONTROLS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CONTROLS = yes; then
echo "${ECHO_T}$result" >&6; }
-if test "$wxUSE_CONTROLS" = "yes"; then
- DEFAULT_wxUSE_ACCEL=yes
- DEFAULT_wxUSE_ANIMATIONCTRL=yes
- DEFAULT_wxUSE_BMPBUTTON=yes
- DEFAULT_wxUSE_BUTTON=yes
- DEFAULT_wxUSE_CALCTRL=yes
- DEFAULT_wxUSE_CARET=yes
- DEFAULT_wxUSE_COMBOBOX=yes
- DEFAULT_wxUSE_CHECKBOX=yes
- DEFAULT_wxUSE_CHECKLISTBOX=yes
- DEFAULT_wxUSE_CHOICE=yes
- DEFAULT_wxUSE_CHOICEBOOK=yes
- DEFAULT_wxUSE_COLLPANE=yes
- DEFAULT_wxUSE_COLOURPICKERCTRL=yes
- DEFAULT_wxUSE_COMBOBOX=yes
- DEFAULT_wxUSE_DATEPICKCTRL=yes
- 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
- DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_HYPERLINKCTRL=yes
- DEFAULT_wxUSE_DATAVIEWCTRL=no
- DEFAULT_wxUSE_IMAGLIST=yes
- DEFAULT_wxUSE_LISTBOOK=yes
- DEFAULT_wxUSE_LISTBOX=yes
- DEFAULT_wxUSE_LISTCTRL=yes
- DEFAULT_wxUSE_NOTEBOOK=yes
- DEFAULT_wxUSE_RADIOBOX=yes
- DEFAULT_wxUSE_RADIOBTN=yes
- DEFAULT_wxUSE_SASH=yes
- DEFAULT_wxUSE_SCROLLBAR=yes
- DEFAULT_wxUSE_SEARCHCTRL=yes
- DEFAULT_wxUSE_SLIDER=yes
- DEFAULT_wxUSE_SPINBTN=yes
- DEFAULT_wxUSE_SPINCTRL=yes
- DEFAULT_wxUSE_SPLITTER=yes
- DEFAULT_wxUSE_STATBMP=yes
- DEFAULT_wxUSE_STATBOX=yes
- DEFAULT_wxUSE_STATLINE=yes
- DEFAULT_wxUSE_STATUSBAR=yes
- DEFAULT_wxUSE_TAB_DIALOG=yes
- DEFAULT_wxUSE_TOGGLEBTN=yes
- DEFAULT_wxUSE_TOOLBAR=yes
- DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
- DEFAULT_wxUSE_TOOLTIPS=yes
- DEFAULT_wxUSE_TREEBOOK=yes
- DEFAULT_wxUSE_TOOLBOOK=yes
- DEFAULT_wxUSE_TREECTRL=yes
- DEFAULT_wxUSE_POPUPWIN=yes
- DEFAULT_wxUSE_TIPWINDOW=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
- DEFAULT_wxUSE_ACCEL=no
- DEFAULT_wxUSE_ANIMATIONCTRL=no
- DEFAULT_wxUSE_BMPBUTTON=no
- DEFAULT_wxUSE_BUTTON=no
- DEFAULT_wxUSE_CALCTRL=no
- DEFAULT_wxUSE_CARET=no
- DEFAULT_wxUSE_COLLPANE=no
- DEFAULT_wxUSE_COMBOBOX=no
- DEFAULT_wxUSE_CHECKBOX=no
- DEFAULT_wxUSE_CHECKLISTBOX=no
- DEFAULT_wxUSE_CHOICE=no
- DEFAULT_wxUSE_CHOICEBOOK=no
- DEFAULT_wxUSE_COLOURPICKERCTRL=no
- DEFAULT_wxUSE_COMBOBOX=no
- DEFAULT_wxUSE_DATEPICKCTRL=no
- 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
- DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_HYPERLINKCTRL=no
- DEFAULT_wxUSE_DATAVIEWCTRL=no
- DEFAULT_wxUSE_IMAGLIST=no
- DEFAULT_wxUSE_LISTBOOK=no
- DEFAULT_wxUSE_LISTBOX=no
- DEFAULT_wxUSE_LISTCTRL=no
- DEFAULT_wxUSE_NOTEBOOK=no
- DEFAULT_wxUSE_RADIOBOX=no
- DEFAULT_wxUSE_RADIOBTN=no
- DEFAULT_wxUSE_SASH=no
- DEFAULT_wxUSE_SCROLLBAR=no
- DEFAULT_wxUSE_SEARCHCTRL=no
- DEFAULT_wxUSE_SLIDER=no
- DEFAULT_wxUSE_SPINBTN=no
- DEFAULT_wxUSE_SPINCTRL=no
- DEFAULT_wxUSE_SPLITTER=no
- DEFAULT_wxUSE_STATBMP=no
- DEFAULT_wxUSE_STATBOX=no
- DEFAULT_wxUSE_STATLINE=no
- DEFAULT_wxUSE_STATUSBAR=no
- DEFAULT_wxUSE_TAB_DIALOG=no
- DEFAULT_wxUSE_TOGGLEBTN=no
- DEFAULT_wxUSE_TOOLBAR=no
- DEFAULT_wxUSE_TOOLBAR_NATIVE=no
- DEFAULT_wxUSE_TOOLTIPS=no
- DEFAULT_wxUSE_TREEBOOK=no
- DEFAULT_wxUSE_TOOLBOOK=no
- DEFAULT_wxUSE_TREECTRL=no
- DEFAULT_wxUSE_POPUPWIN=no
- DEFAULT_wxUSE_TIPWINDOW=no
+if test "$wxUSE_CONTROLS" = "no"; then
+ DEFAULT_wxUSE_ACCEL=no
+ DEFAULT_wxUSE_ANIMATIONCTRL=no
+ DEFAULT_wxUSE_BMPBUTTON=no
+ DEFAULT_wxUSE_BUTTON=no
+ DEFAULT_wxUSE_CALCTRL=no
+ DEFAULT_wxUSE_CARET=no
+ DEFAULT_wxUSE_CHECKBOX=no
+ DEFAULT_wxUSE_CHECKLISTBOX=no
+ DEFAULT_wxUSE_CHOICE=no
+ DEFAULT_wxUSE_CHOICEBOOK=no
+ DEFAULT_wxUSE_COLLPANE=no
+ DEFAULT_wxUSE_COLOURPICKERCTRL=no
+ DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_DATAVIEWCTRL=no
+ DEFAULT_wxUSE_DATEPICKCTRL=no
+ DEFAULT_wxUSE_DETECT_SM=no
+ DEFAULT_wxUSE_DIRPICKERCTRL=no
+ DEFAULT_wxUSE_DISPLAY=no
+ DEFAULT_wxUSE_FILECTRL=no
+ DEFAULT_wxUSE_FILEPICKERCTRL=no
+ DEFAULT_wxUSE_FONTPICKERCTRL=no
+ DEFAULT_wxUSE_GAUGE=no
+ DEFAULT_wxUSE_GRID=no
+ DEFAULT_wxUSE_HEADERCTRL=no
+ DEFAULT_wxUSE_HYPERLINKCTRL=no
+ DEFAULT_wxUSE_IMAGLIST=no
+ DEFAULT_wxUSE_LISTBOOK=no
+ DEFAULT_wxUSE_LISTBOX=no
+ DEFAULT_wxUSE_LISTCTRL=no
+ DEFAULT_wxUSE_NOTEBOOK=no
+ DEFAULT_wxUSE_POPUPWIN=no
+ DEFAULT_wxUSE_RADIOBOX=no
+ DEFAULT_wxUSE_RADIOBTN=no
+ DEFAULT_wxUSE_REARRANGECTRL=no
+ DEFAULT_wxUSE_SASH=no
+ DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_SEARCHCTRL=no
+ DEFAULT_wxUSE_SLIDER=no
+ DEFAULT_wxUSE_SPINBTN=no
+ DEFAULT_wxUSE_SPINCTRL=no
+ DEFAULT_wxUSE_SPLITTER=no
+ DEFAULT_wxUSE_STATBMP=no
+ DEFAULT_wxUSE_STATBOX=no
+ DEFAULT_wxUSE_STATLINE=no
+ DEFAULT_wxUSE_STATUSBAR=no
+ DEFAULT_wxUSE_TIPWINDOW=no
+ DEFAULT_wxUSE_TOGGLEBTN=no
+ DEFAULT_wxUSE_TOOLBAR=no
+ DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+ DEFAULT_wxUSE_TOOLBOOK=no
+ DEFAULT_wxUSE_TOOLTIPS=no
+ DEFAULT_wxUSE_TREEBOOK=no
+ DEFAULT_wxUSE_TREECTRL=no
fi
else
wx_cv_use_accel='wxUSE_ACCEL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ACCEL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_accel='wxUSE_ACCEL=${'DEFAULT_wxUSE_ACCEL":-$defaultval}"
fi
eval "$wx_cv_use_accel"
- if test "x$cache" = xyes; then
- echo "wxUSE_ACCEL=$wxUSE_ACCEL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ACCEL = yes; then
else
wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ANIMATIONCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_animatectrl='wxUSE_ANIMATIONCTRL=${'DEFAULT_wxUSE_ANIMATIONCTRL":-$defaultval}"
fi
eval "$wx_cv_use_animatectrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_ANIMATIONCTRL=$wxUSE_ANIMATIONCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ANIMATIONCTRL = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
- # Check whether --enable-button was given.
-if test "${enable_button+set}" = set; then
- enableval=$enable_button;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
+ # Check whether --enable-bmpbutton was given.
+if test "${enable_bmpbutton+set}" = set; then
+ enableval=$enable_bmpbutton;
if test "$enableval" = yes; then
- wx_cv_use_button='wxUSE_BUTTON=yes'
+ wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
else
- wx_cv_use_button='wxUSE_BUTTON=no'
+ wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_BUTTON=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
+ wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
fi
- eval "$wx_cv_use_button"
- if test "x$cache" = xyes; then
- echo "wxUSE_BUTTON=$wxUSE_BUTTON" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_bmpbutton"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BUTTON = yes; then
+ if test $wxUSE_BMPBUTTON = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_BUTTON
+ result=$wxUSE_BMPBUTTON
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpbutton" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-bmpbutton... $ECHO_C" >&6; }
- # Check whether --enable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
- enableval=$enable_bmpbutton;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
+ # Check whether --enable-bmpcombobox was given.
+if test "${enable_bmpcombobox+set}" = set; then
+ enableval=$enable_bmpcombobox;
if test "$enableval" = yes; then
- wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+ wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
else
- wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+ wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_BMPBUTTON=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_bmpbutton='wxUSE_BMPBUTTON=${'DEFAULT_wxUSE_BMPBUTTON":-$defaultval}"
+ wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
fi
- eval "$wx_cv_use_bmpbutton"
- if test "x$cache" = xyes; then
- echo "wxUSE_BMPBUTTON=$wxUSE_BMPBUTTON" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_bmpcombobox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BMPBUTTON = yes; then
+ if test $wxUSE_BITMAPCOMBOBOX = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_BMPBUTTON
+ result=$wxUSE_BITMAPCOMBOBOX
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-bmpcombobox" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-bmpcombobox... $ECHO_C" >&6; }
- # Check whether --enable-bmpcombobox was given.
-if test "${enable_bmpcombobox+set}" = set; then
- enableval=$enable_bmpcombobox;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-button" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-button... $ECHO_C" >&6; }
+ # Check whether --enable-button was given.
+if test "${enable_button+set}" = set; then
+ enableval=$enable_button;
if test "$enableval" = yes; then
- wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=yes'
+ wx_cv_use_button='wxUSE_BUTTON=yes'
else
- wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=no'
+ wx_cv_use_button='wxUSE_BUTTON=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_BITMAPCOMBOBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_bmpcombobox='wxUSE_BITMAPCOMBOBOX=${'DEFAULT_wxUSE_BITMAPCOMBOBOX":-$defaultval}"
+ wx_cv_use_button='wxUSE_BUTTON=${'DEFAULT_wxUSE_BUTTON":-$defaultval}"
fi
- eval "$wx_cv_use_bmpcombobox"
- if test "x$cache" = xyes; then
- echo "wxUSE_BITMAPCOMBOBOX=$wxUSE_BITMAPCOMBOBOX" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_button"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BITMAPCOMBOBOX = yes; then
+ if test $wxUSE_BUTTON = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_BITMAPCOMBOBOX
+ result=$wxUSE_BUTTON
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_calendar='wxUSE_CALCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CALCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_calendar='wxUSE_CALCTRL=${'DEFAULT_wxUSE_CALCTRL":-$defaultval}"
fi
eval "$wx_cv_use_calendar"
- if test "x$cache" = xyes; then
- echo "wxUSE_CALCTRL=$wxUSE_CALCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CALCTRL = yes; then
else
wx_cv_use_caret='wxUSE_CARET=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CARET=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_caret='wxUSE_CARET=${'DEFAULT_wxUSE_CARET":-$defaultval}"
fi
eval "$wx_cv_use_caret"
- if test "x$cache" = xyes; then
- echo "wxUSE_CARET=$wxUSE_CARET" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CARET = yes; then
else
wx_cv_use_checkbox='wxUSE_CHECKBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CHECKBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_checkbox='wxUSE_CHECKBOX=${'DEFAULT_wxUSE_CHECKBOX":-$defaultval}"
fi
eval "$wx_cv_use_checkbox"
- if test "x$cache" = xyes; then
- echo "wxUSE_CHECKBOX=$wxUSE_CHECKBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CHECKBOX = yes; then
else
wx_cv_use_checklst='wxUSE_CHECKLST=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CHECKLST=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_checklst='wxUSE_CHECKLST=${'DEFAULT_wxUSE_CHECKLST":-$defaultval}"
fi
eval "$wx_cv_use_checklst"
- if test "x$cache" = xyes; then
- echo "wxUSE_CHECKLST=$wxUSE_CHECKLST" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CHECKLST = yes; then
else
wx_cv_use_choice='wxUSE_CHOICE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CHOICE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_choice='wxUSE_CHOICE=${'DEFAULT_wxUSE_CHOICE":-$defaultval}"
fi
eval "$wx_cv_use_choice"
- if test "x$cache" = xyes; then
- echo "wxUSE_CHOICE=$wxUSE_CHOICE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CHOICE = yes; then
else
wx_cv_use_choicebook='wxUSE_CHOICEBOOK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CHOICEBOOK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_choicebook='wxUSE_CHOICEBOOK=${'DEFAULT_wxUSE_CHOICEBOOK":-$defaultval}"
fi
eval "$wx_cv_use_choicebook"
- if test "x$cache" = xyes; then
- echo "wxUSE_CHOICEBOOK=$wxUSE_CHOICEBOOK" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CHOICEBOOK = yes; then
else
wx_cv_use_collpane='wxUSE_COLLPANE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_COLLPANE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_collpane='wxUSE_COLLPANE=${'DEFAULT_wxUSE_COLLPANE":-$defaultval}"
fi
eval "$wx_cv_use_collpane"
- if test "x$cache" = xyes; then
- echo "wxUSE_COLLPANE=$wxUSE_COLLPANE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_COLLPANE = yes; then
else
wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_COLOURPICKERCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_colourpicker='wxUSE_COLOURPICKERCTRL=${'DEFAULT_wxUSE_COLOURPICKERCTRL":-$defaultval}"
fi
eval "$wx_cv_use_colourpicker"
- if test "x$cache" = xyes; then
- echo "wxUSE_COLOURPICKERCTRL=$wxUSE_COLOURPICKERCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_COLOURPICKERCTRL = yes; then
else
wx_cv_use_combobox='wxUSE_COMBOBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_COMBOBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_combobox='wxUSE_COMBOBOX=${'DEFAULT_wxUSE_COMBOBOX":-$defaultval}"
fi
eval "$wx_cv_use_combobox"
- if test "x$cache" = xyes; then
- echo "wxUSE_COMBOBOX=$wxUSE_COMBOBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_COMBOBOX = yes; then
else
wx_cv_use_comboctrl='wxUSE_COMBOCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_COMBOCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_comboctrl='wxUSE_COMBOCTRL=${'DEFAULT_wxUSE_COMBOCTRL":-$defaultval}"
fi
eval "$wx_cv_use_comboctrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_COMBOCTRL=$wxUSE_COMBOCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_COMBOCTRL = yes; then
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}-dataviewctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
+ # Check whether --enable-dataviewctrl was given.
+if test "${enable_dataviewctrl+set}" = set; then
+ enableval=$enable_dataviewctrl;
+ if test "$enableval" = yes; then
+ wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+ else
+ wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+ fi
+
+else
+
+ wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_dataviewctrl"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_DATAVIEWCTRL = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_DATAVIEWCTRL
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_datepick='wxUSE_DATEPICKCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DATEPICKCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_datepick='wxUSE_DATEPICKCTRL=${'DEFAULT_wxUSE_DATEPICKCTRL":-$defaultval}"
fi
eval "$wx_cv_use_datepick"
- if test "x$cache" = xyes; then
- echo "wxUSE_DATEPICKCTRL=$wxUSE_DATEPICKCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DATEPICKCTRL = yes; then
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}-detect_sm" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
+ # Check whether --enable-detect_sm was given.
+if test "${enable_detect_sm+set}" = set; then
+ enableval=$enable_detect_sm;
+ if test "$enableval" = yes; then
+ wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
+ else
+ wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
+ fi
+
+else
+
+ wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_detect_sm"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_DETECT_SM = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_DETECT_SM
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DIRPICKERCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dirpicker='wxUSE_DIRPICKERCTRL=${'DEFAULT_wxUSE_DIRPICKERCTRL":-$defaultval}"
fi
eval "$wx_cv_use_dirpicker"
- if test "x$cache" = xyes; then
- echo "wxUSE_DIRPICKERCTRL=$wxUSE_DIRPICKERCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DIRPICKERCTRL = yes; then
else
wx_cv_use_display='wxUSE_DISPLAY=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DISPLAY=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_display='wxUSE_DISPLAY=${'DEFAULT_wxUSE_DISPLAY":-$defaultval}"
fi
eval "$wx_cv_use_display"
- if test "x$cache" = xyes; then
- echo "wxUSE_DISPLAY=$wxUSE_DISPLAY" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DISPLAY = yes; then
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}-detect_sm" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-detect_sm... $ECHO_C" >&6; }
- # Check whether --enable-detect_sm was given.
-if test "${enable_detect_sm+set}" = set; then
- enableval=$enable_detect_sm;
- if test "$enableval" = yes; then
- wx_cv_use_detect_sm='wxUSE_DETECT_SM=yes'
- else
- wx_cv_use_detect_sm='wxUSE_DETECT_SM=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_DETECT_SM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_detect_sm='wxUSE_DETECT_SM=${'DEFAULT_wxUSE_DETECT_SM":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_detect_sm"
- if test "x$cache" = xyes; then
- echo "wxUSE_DETECT_SM=$wxUSE_DETECT_SM" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_DETECT_SM = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_DETECT_SM
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_EDITABLELISTBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_editablebox='wxUSE_EDITABLELISTBOX=${'DEFAULT_wxUSE_EDITABLELISTBOX":-$defaultval}"
fi
eval "$wx_cv_use_editablebox"
- if test "x$cache" = xyes; then
- echo "wxUSE_EDITABLELISTBOX=$wxUSE_EDITABLELISTBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_EDITABLELISTBOX = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
- # Check whether --enable-filepicker was given.
-if test "${enable_filepicker+set}" = set; then
- enableval=$enable_filepicker;
+ { 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_filepicker='wxUSE_FILEPICKERCTRL=yes'
+ wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
else
- wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=no'
+ wx_cv_use_filectrl='wxUSE_FILECTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FILEPICKERCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
+ wx_cv_use_filectrl='wxUSE_FILECTRL=${'DEFAULT_wxUSE_FILECTRL":-$defaultval}"
fi
- eval "$wx_cv_use_filepicker"
- if test "x$cache" = xyes; then
- echo "wxUSE_FILEPICKERCTRL=$wxUSE_FILEPICKERCTRL" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_filectrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILEPICKERCTRL = yes; then
+ if test $wxUSE_FILECTRL = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_FILEPICKERCTRL
+ result=$wxUSE_FILECTRL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
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;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filepicker" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filepicker... $ECHO_C" >&6; }
+ # Check whether --enable-filepicker was given.
+if test "${enable_filepicker+set}" = set; then
+ enableval=$enable_filepicker;
if test "$enableval" = yes; then
- wx_cv_use_filectrl='wxUSE_FILECTRL=yes'
+ wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=yes'
else
- wx_cv_use_filectrl='wxUSE_FILECTRL=no'
+ wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=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}"
+ wx_cv_use_filepicker='wxUSE_FILEPICKERCTRL=${'DEFAULT_wxUSE_FILEPICKERCTRL":-$defaultval}"
fi
- eval "$wx_cv_use_filectrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_FILECTRL=$wxUSE_FILECTRL" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_filepicker"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILECTRL = yes; then
+ if test $wxUSE_FILEPICKERCTRL = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_FILECTRL
+ result=$wxUSE_FILEPICKERCTRL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FONTPICKERCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fontpicker='wxUSE_FONTPICKERCTRL=${'DEFAULT_wxUSE_FONTPICKERCTRL":-$defaultval}"
fi
eval "$wx_cv_use_fontpicker"
- if test "x$cache" = xyes; then
- echo "wxUSE_FONTPICKERCTRL=$wxUSE_FONTPICKERCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FONTPICKERCTRL = yes; then
else
wx_cv_use_gauge='wxUSE_GAUGE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GAUGE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_gauge='wxUSE_GAUGE=${'DEFAULT_wxUSE_GAUGE":-$defaultval}"
fi
eval "$wx_cv_use_gauge"
- if test "x$cache" = xyes; then
- echo "wxUSE_GAUGE=$wxUSE_GAUGE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GAUGE = yes; then
else
wx_cv_use_grid='wxUSE_GRID=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GRID=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_grid='wxUSE_GRID=${'DEFAULT_wxUSE_GRID":-$defaultval}"
fi
eval "$wx_cv_use_grid"
- if test "x$cache" = xyes; then
- echo "wxUSE_GRID=$wxUSE_GRID" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GRID = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dataviewctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dataviewctrl... $ECHO_C" >&6; }
- # Check whether --enable-dataviewctrl was given.
-if test "${enable_dataviewctrl+set}" = set; then
- enableval=$enable_dataviewctrl;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-headerctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-headerctrl... $ECHO_C" >&6; }
+ # Check whether --enable-headerctrl was given.
+if test "${enable_headerctrl+set}" = set; then
+ enableval=$enable_headerctrl;
if test "$enableval" = yes; then
- wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=yes'
+ wx_cv_use_headerctrl='wxUSE_HEADERCTRL=yes'
else
- wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=no'
+ wx_cv_use_headerctrl='wxUSE_HEADERCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DATAVIEWCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_dataviewctrl='wxUSE_DATAVIEWCTRL=${'DEFAULT_wxUSE_DATAVIEWCTRL":-$defaultval}"
+ wx_cv_use_headerctrl='wxUSE_HEADERCTRL=${'DEFAULT_wxUSE_HEADERCTRL":-$defaultval}"
fi
- eval "$wx_cv_use_dataviewctrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_DATAVIEWCTRL=$wxUSE_DATAVIEWCTRL" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_headerctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DATAVIEWCTRL = yes; then
+ if test $wxUSE_HEADERCTRL = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_DATAVIEWCTRL
+ result=$wxUSE_HEADERCTRL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_HYPERLINKCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_hyperlink='wxUSE_HYPERLINKCTRL=${'DEFAULT_wxUSE_HYPERLINKCTRL":-$defaultval}"
fi
eval "$wx_cv_use_hyperlink"
- if test "x$cache" = xyes; then
- echo "wxUSE_HYPERLINKCTRL=$wxUSE_HYPERLINKCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_HYPERLINKCTRL = yes; then
else
wx_cv_use_imaglist='wxUSE_IMAGLIST=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_IMAGLIST=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_imaglist='wxUSE_IMAGLIST=${'DEFAULT_wxUSE_IMAGLIST":-$defaultval}"
fi
eval "$wx_cv_use_imaglist"
- if test "x$cache" = xyes; then
- echo "wxUSE_IMAGLIST=$wxUSE_IMAGLIST" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_IMAGLIST = yes; then
else
wx_cv_use_listbook='wxUSE_LISTBOOK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LISTBOOK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_listbook='wxUSE_LISTBOOK=${'DEFAULT_wxUSE_LISTBOOK":-$defaultval}"
fi
eval "$wx_cv_use_listbook"
- if test "x$cache" = xyes; then
- echo "wxUSE_LISTBOOK=$wxUSE_LISTBOOK" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_LISTBOOK = yes; then
else
wx_cv_use_listbox='wxUSE_LISTBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LISTBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_listbox='wxUSE_LISTBOX=${'DEFAULT_wxUSE_LISTBOX":-$defaultval}"
fi
eval "$wx_cv_use_listbox"
- if test "x$cache" = xyes; then
- echo "wxUSE_LISTBOX=$wxUSE_LISTBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_LISTBOX = yes; then
else
wx_cv_use_listctrl='wxUSE_LISTCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_LISTCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_listctrl='wxUSE_LISTCTRL=${'DEFAULT_wxUSE_LISTCTRL":-$defaultval}"
fi
eval "$wx_cv_use_listctrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_LISTCTRL=$wxUSE_LISTCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_LISTCTRL = yes; then
else
wx_cv_use_notebook='wxUSE_NOTEBOOK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_NOTEBOOK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_notebook='wxUSE_NOTEBOOK=${'DEFAULT_wxUSE_NOTEBOOK":-$defaultval}"
fi
eval "$wx_cv_use_notebook"
- if test "x$cache" = xyes; then
- echo "wxUSE_NOTEBOOK=$wxUSE_NOTEBOOK" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_NOTEBOOK = yes; then
echo "${ECHO_T}$result" >&6; }
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-notifmsg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-notifmsg... $ECHO_C" >&6; }
+ # Check whether --enable-notifmsg was given.
+if test "${enable_notifmsg+set}" = set; then
+ enableval=$enable_notifmsg;
+ if test "$enableval" = yes; then
+ wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=yes'
+ else
+ wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=no'
+ fi
+
+else
+
+ wx_cv_use_notifmsg='wxUSE_NOTIFICATION_MESSAGE=${'DEFAULT_wxUSE_NOTIFICATION_MESSAGE":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_notifmsg"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_NOTIFICATION_MESSAGE = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_NOTIFICATION_MESSAGE
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ODCOMBOBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_odcombobox='wxUSE_ODCOMBOBOX=${'DEFAULT_wxUSE_ODCOMBOBOX":-$defaultval}"
fi
eval "$wx_cv_use_odcombobox"
- if test "x$cache" = xyes; then
- echo "wxUSE_ODCOMBOBOX=$wxUSE_ODCOMBOBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ODCOMBOBOX = yes; then
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}-popupwin" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
+ # Check whether --enable-popupwin was given.
+if test "${enable_popupwin+set}" = set; then
+ enableval=$enable_popupwin;
+ if test "$enableval" = yes; then
+ wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+ else
+ wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
+ fi
+
+else
+
+ wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_popupwin"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_POPUPWIN = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_POPUPWIN
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_radiobox='wxUSE_RADIOBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_RADIOBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_radiobox='wxUSE_RADIOBOX=${'DEFAULT_wxUSE_RADIOBOX":-$defaultval}"
fi
eval "$wx_cv_use_radiobox"
- if test "x$cache" = xyes; then
- echo "wxUSE_RADIOBOX=$wxUSE_RADIOBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_RADIOBOX = yes; then
else
wx_cv_use_radiobtn='wxUSE_RADIOBTN=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_RADIOBTN=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_radiobtn='wxUSE_RADIOBTN=${'DEFAULT_wxUSE_RADIOBTN":-$defaultval}"
fi
eval "$wx_cv_use_radiobtn"
- if test "x$cache" = xyes; then
- echo "wxUSE_RADIOBTN=$wxUSE_RADIOBTN" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_RADIOBTN = yes; then
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}-rearrangectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-rearrangectrl... $ECHO_C" >&6; }
+ # Check whether --enable-rearrangectrl was given.
+if test "${enable_rearrangectrl+set}" = set; then
+ enableval=$enable_rearrangectrl;
+ if test "$enableval" = yes; then
+ wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=yes'
+ else
+ wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=no'
+ fi
+
+else
+
+ wx_cv_use_rearrangectrl='wxUSE_REARRANGECTRL=${'DEFAULT_wxUSE_REARRANGECTRL":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_rearrangectrl"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_REARRANGECTRL = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_REARRANGECTRL
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_sash='wxUSE_SASH=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SASH=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_sash='wxUSE_SASH=${'DEFAULT_wxUSE_SASH":-$defaultval}"
fi
eval "$wx_cv_use_sash"
- if test "x$cache" = xyes; then
- echo "wxUSE_SASH=$wxUSE_SASH" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SASH = yes; then
else
wx_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SCROLLBAR=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_scrollbar='wxUSE_SCROLLBAR=${'DEFAULT_wxUSE_SCROLLBAR":-$defaultval}"
fi
eval "$wx_cv_use_scrollbar"
- if test "x$cache" = xyes; then
- echo "wxUSE_SCROLLBAR=$wxUSE_SCROLLBAR" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SCROLLBAR = yes; then
else
wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SEARCHCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_searchctrl='wxUSE_SEARCHCTRL=${'DEFAULT_wxUSE_SEARCHCTRL":-$defaultval}"
fi
eval "$wx_cv_use_searchctrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_SEARCHCTRL=$wxUSE_SEARCHCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SEARCHCTRL = yes; then
else
wx_cv_use_slider='wxUSE_SLIDER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SLIDER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_slider='wxUSE_SLIDER=${'DEFAULT_wxUSE_SLIDER":-$defaultval}"
fi
eval "$wx_cv_use_slider"
- if test "x$cache" = xyes; then
- echo "wxUSE_SLIDER=$wxUSE_SLIDER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SLIDER = yes; then
else
wx_cv_use_spinbtn='wxUSE_SPINBTN=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SPINBTN=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_spinbtn='wxUSE_SPINBTN=${'DEFAULT_wxUSE_SPINBTN":-$defaultval}"
fi
eval "$wx_cv_use_spinbtn"
- if test "x$cache" = xyes; then
- echo "wxUSE_SPINBTN=$wxUSE_SPINBTN" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SPINBTN = yes; then
else
wx_cv_use_spinctrl='wxUSE_SPINCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SPINCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_spinctrl='wxUSE_SPINCTRL=${'DEFAULT_wxUSE_SPINCTRL":-$defaultval}"
fi
eval "$wx_cv_use_spinctrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_SPINCTRL=$wxUSE_SPINCTRL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SPINCTRL = yes; then
else
wx_cv_use_splitter='wxUSE_SPLITTER=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SPLITTER=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_splitter='wxUSE_SPLITTER=${'DEFAULT_wxUSE_SPLITTER":-$defaultval}"
fi
eval "$wx_cv_use_splitter"
- if test "x$cache" = xyes; then
- echo "wxUSE_SPLITTER=$wxUSE_SPLITTER" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SPLITTER = yes; then
else
wx_cv_use_statbmp='wxUSE_STATBMP=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STATBMP=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_statbmp='wxUSE_STATBMP=${'DEFAULT_wxUSE_STATBMP":-$defaultval}"
fi
eval "$wx_cv_use_statbmp"
- if test "x$cache" = xyes; then
- echo "wxUSE_STATBMP=$wxUSE_STATBMP" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STATBMP = yes; then
else
wx_cv_use_statbox='wxUSE_STATBOX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STATBOX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_statbox='wxUSE_STATBOX=${'DEFAULT_wxUSE_STATBOX":-$defaultval}"
fi
eval "$wx_cv_use_statbox"
- if test "x$cache" = xyes; then
- echo "wxUSE_STATBOX=$wxUSE_STATBOX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STATBOX = yes; then
else
wx_cv_use_statline='wxUSE_STATLINE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STATLINE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_statline='wxUSE_STATLINE=${'DEFAULT_wxUSE_STATLINE":-$defaultval}"
fi
eval "$wx_cv_use_statline"
- if test "x$cache" = xyes; then
- echo "wxUSE_STATLINE=$wxUSE_STATLINE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STATLINE = yes; then
else
wx_cv_use_stattext='wxUSE_STATTEXT=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STATTEXT=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_stattext='wxUSE_STATTEXT=${'DEFAULT_wxUSE_STATTEXT":-$defaultval}"
fi
eval "$wx_cv_use_stattext"
- if test "x$cache" = xyes; then
- echo "wxUSE_STATTEXT=$wxUSE_STATTEXT" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STATTEXT = yes; then
else
wx_cv_use_statusbar='wxUSE_STATUSBAR=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STATUSBAR=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_statusbar='wxUSE_STATUSBAR=${'DEFAULT_wxUSE_STATUSBAR":-$defaultval}"
fi
eval "$wx_cv_use_statusbar"
- if test "x$cache" = xyes; then
- echo "wxUSE_STATUSBAR=$wxUSE_STATUSBAR" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STATUSBAR = yes; then
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}-tabdialog" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tabdialog... $ECHO_C" >&6; }
- # Check whether --enable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
- enableval=$enable_tabdialog;
- if test "$enableval" = yes; then
- wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=yes'
- else
- wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_TAB_DIALOG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_tabdialog='wxUSE_TAB_DIALOG=${'DEFAULT_wxUSE_TAB_DIALOG":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_tabdialog"
- if test "x$cache" = xyes; then
- echo "wxUSE_TAB_DIALOG=$wxUSE_TAB_DIALOG" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_TAB_DIALOG = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_TAB_DIALOG
- fi
-
- { echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6; }
-
-
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
else
wx_cv_use_taskbaricon='wxUSE_TASKBARICON=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TASKBARICON=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_taskbaricon='wxUSE_TASKBARICON=${'DEFAULT_wxUSE_TASKBARICON":-$defaultval}"
fi
eval "$wx_cv_use_taskbaricon"
- if test "x$cache" = xyes; then
- echo "wxUSE_TASKBARICON=$wxUSE_TASKBARICON" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TASKBARICON = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
- # Check whether --enable-textctrl was given.
-if test "${enable_textctrl+set}" = set; then
- enableval=$enable_textctrl;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
+ # Check whether --enable-tbarnative was given.
+if test "${enable_tbarnative+set}" = set; then
+ enableval=$enable_tbarnative;
if test "$enableval" = yes; then
- wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+ wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
else
- wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+ wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TEXTCTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
+ wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
fi
- eval "$wx_cv_use_textctrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_TEXTCTRL=$wxUSE_TEXTCTRL" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_tbarnative"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TEXTCTRL = yes; then
+ if test $wxUSE_TOOLBAR_NATIVE = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_TEXTCTRL
+ result=$wxUSE_TOOLBAR_NATIVE
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
- # Check whether --enable-togglebtn was given.
-if test "${enable_togglebtn+set}" = set; then
- enableval=$enable_togglebtn;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textctrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textctrl... $ECHO_C" >&6; }
+ # Check whether --enable-textctrl was given.
+if test "${enable_textctrl+set}" = set; then
+ enableval=$enable_textctrl;
if test "$enableval" = yes; then
- wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+ wx_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
else
- wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+ wx_cv_use_textctrl='wxUSE_TEXTCTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TOGGLEBTN=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
+ wx_cv_use_textctrl='wxUSE_TEXTCTRL=${'DEFAULT_wxUSE_TEXTCTRL":-$defaultval}"
fi
- eval "$wx_cv_use_togglebtn"
- if test "x$cache" = xyes; then
- echo "wxUSE_TOGGLEBTN=$wxUSE_TOGGLEBTN" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_textctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOGGLEBTN = yes; then
+ if test $wxUSE_TEXTCTRL = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_TOGGLEBTN
+ result=$wxUSE_TEXTCTRL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
- # Check whether --enable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
- enableval=$enable_toolbar;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tipwindow" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
+ # Check whether --enable-tipwindow was given.
+if test "${enable_tipwindow+set}" = set; then
+ enableval=$enable_tipwindow;
if test "$enableval" = yes; then
- wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+ wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
else
- wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
+ wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TOOLBAR=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
+ wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
fi
- eval "$wx_cv_use_toolbar"
- if test "x$cache" = xyes; then
- echo "wxUSE_TOOLBAR=$wxUSE_TOOLBAR" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_tipwindow"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOOLBAR = yes; then
+ if test $wxUSE_TIPWINDOW = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_TOOLBAR
+ result=$wxUSE_TIPWINDOW
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-tbarnative" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tbarnative... $ECHO_C" >&6; }
- # Check whether --enable-tbarnative was given.
-if test "${enable_tbarnative+set}" = set; then
- enableval=$enable_tbarnative;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-togglebtn" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-togglebtn... $ECHO_C" >&6; }
+ # Check whether --enable-togglebtn was given.
+if test "${enable_togglebtn+set}" = set; then
+ enableval=$enable_togglebtn;
if test "$enableval" = yes; then
- wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+ wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
else
- wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+ wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TOOLBAR_NATIVE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=${'DEFAULT_wxUSE_TOOLBAR_NATIVE":-$defaultval}"
+ wx_cv_use_togglebtn='wxUSE_TOGGLEBTN=${'DEFAULT_wxUSE_TOGGLEBTN":-$defaultval}"
fi
- eval "$wx_cv_use_tbarnative"
- if test "x$cache" = xyes; then
- echo "wxUSE_TOOLBAR_NATIVE=$wxUSE_TOOLBAR_NATIVE" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_togglebtn"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOOLBAR_NATIVE = yes; then
+ if test $wxUSE_TOGGLEBTN = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_TOOLBAR_NATIVE
+ result=$wxUSE_TOGGLEBTN
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
- # Check whether --enable-treebook was given.
-if test "${enable_treebook+set}" = set; then
- enableval=$enable_treebook;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-toolbar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-toolbar... $ECHO_C" >&6; }
+ # Check whether --enable-toolbar was given.
+if test "${enable_toolbar+set}" = set; then
+ enableval=$enable_toolbar;
if test "$enableval" = yes; then
- wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
+ wx_cv_use_toolbar='wxUSE_TOOLBAR=yes'
else
- wx_cv_use_treebook='wxUSE_TREEBOOK=no'
+ wx_cv_use_toolbar='wxUSE_TOOLBAR=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TREEBOOK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
+ wx_cv_use_toolbar='wxUSE_TOOLBAR=${'DEFAULT_wxUSE_TOOLBAR":-$defaultval}"
fi
- eval "$wx_cv_use_treebook"
- if test "x$cache" = xyes; then
- echo "wxUSE_TREEBOOK=$wxUSE_TREEBOOK" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_toolbar"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TREEBOOK = yes; then
+ if test $wxUSE_TOOLBAR = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_TREEBOOK
+ result=$wxUSE_TOOLBAR
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_toolbook='wxUSE_TOOLBOOK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TOOLBOOK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_toolbook='wxUSE_TOOLBOOK=${'DEFAULT_wxUSE_TOOLBOOK":-$defaultval}"
fi
eval "$wx_cv_use_toolbook"
- if test "x$cache" = xyes; then
- echo "wxUSE_TOOLBOOK=$wxUSE_TOOLBOOK" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TOOLBOOK = yes; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
- # Check whether --enable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
- enableval=$enable_treectrl;
- if test "$enableval" = yes; then
- wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
- else
- wx_cv_use_treectrl='wxUSE_TREECTRL=no'
- fi
- cache=yes
-
-else
-
- LINE=`grep "^wxUSE_TREECTRL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
-
-fi
-
-
- eval "$wx_cv_use_treectrl"
- if test "x$cache" = xyes; then
- echo "wxUSE_TREECTRL=$wxUSE_TREECTRL" >> ${wx_arg_cache_file}.tmp
- fi
-
- if test x"$enablestring" = xdisable; then
- if test $wxUSE_TREECTRL = yes; then
- result=no
- else
- result=yes
- fi
- else
- result=$wxUSE_TREECTRL
- 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}-tipwindow" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-tipwindow... $ECHO_C" >&6; }
- # Check whether --enable-tipwindow was given.
-if test "${enable_tipwindow+set}" = set; then
- enableval=$enable_tipwindow;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treebook" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treebook... $ECHO_C" >&6; }
+ # Check whether --enable-treebook was given.
+if test "${enable_treebook+set}" = set; then
+ enableval=$enable_treebook;
if test "$enableval" = yes; then
- wx_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+ wx_cv_use_treebook='wxUSE_TREEBOOK=yes'
else
- wx_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+ wx_cv_use_treebook='wxUSE_TREEBOOK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TIPWINDOW=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_tipwindow='wxUSE_TIPWINDOW=${'DEFAULT_wxUSE_TIPWINDOW":-$defaultval}"
+ wx_cv_use_treebook='wxUSE_TREEBOOK=${'DEFAULT_wxUSE_TREEBOOK":-$defaultval}"
fi
- eval "$wx_cv_use_tipwindow"
- if test "x$cache" = xyes; then
- echo "wxUSE_TIPWINDOW=$wxUSE_TIPWINDOW" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_treebook"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TIPWINDOW = yes; then
+ if test $wxUSE_TREEBOOK = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_TIPWINDOW
+ result=$wxUSE_TREEBOOK
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-popupwin" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-popupwin... $ECHO_C" >&6; }
- # Check whether --enable-popupwin was given.
-if test "${enable_popupwin+set}" = set; then
- enableval=$enable_popupwin;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-treectrl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-treectrl... $ECHO_C" >&6; }
+ # Check whether --enable-treectrl was given.
+if test "${enable_treectrl+set}" = set; then
+ enableval=$enable_treectrl;
if test "$enableval" = yes; then
- wx_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+ wx_cv_use_treectrl='wxUSE_TREECTRL=yes'
else
- wx_cv_use_popupwin='wxUSE_POPUPWIN=no'
+ wx_cv_use_treectrl='wxUSE_TREECTRL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_POPUPWIN=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
- wx_cv_use_popupwin='wxUSE_POPUPWIN=${'DEFAULT_wxUSE_POPUPWIN":-$defaultval}"
+ wx_cv_use_treectrl='wxUSE_TREECTRL=${'DEFAULT_wxUSE_TREECTRL":-$defaultval}"
fi
- eval "$wx_cv_use_popupwin"
- if test "x$cache" = xyes; then
- echo "wxUSE_POPUPWIN=$wxUSE_POPUPWIN" >> ${wx_arg_cache_file}.tmp
- fi
+ eval "$wx_cv_use_treectrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_POPUPWIN = yes; then
+ if test $wxUSE_TREECTRL = yes; then
result=no
else
result=yes
fi
else
- result=$wxUSE_POPUPWIN
+ result=$wxUSE_TREECTRL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
else
wx_cv_use_commondlg='wxUSE_COMMONDLGS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_COMMONDLGS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_commondlg='wxUSE_COMMONDLGS=${'DEFAULT_wxUSE_COMMONDLGS":-$defaultval}"
fi
eval "$wx_cv_use_commondlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_COMMONDLGS=$wxUSE_COMMONDLGS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_COMMONDLGS = yes; then
else
wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ABOUTDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_aboutdlg='wxUSE_ABOUTDLG=${'DEFAULT_wxUSE_ABOUTDLG":-$defaultval}"
fi
eval "$wx_cv_use_aboutdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_ABOUTDLG=$wxUSE_ABOUTDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ABOUTDLG = yes; then
else
wx_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_CHOICEDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_choicedlg='wxUSE_CHOICEDLG=${'DEFAULT_wxUSE_CHOICEDLG":-$defaultval}"
fi
eval "$wx_cv_use_choicedlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_CHOICEDLG=$wxUSE_CHOICEDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_CHOICEDLG = yes; then
else
wx_cv_use_coldlg='wxUSE_COLOURDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_COLOURDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_coldlg='wxUSE_COLOURDLG=${'DEFAULT_wxUSE_COLOURDLG":-$defaultval}"
fi
eval "$wx_cv_use_coldlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_COLOURDLG=$wxUSE_COLOURDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_COLOURDLG = yes; then
else
wx_cv_use_filedlg='wxUSE_FILEDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FILEDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_filedlg='wxUSE_FILEDLG=${'DEFAULT_wxUSE_FILEDLG":-$defaultval}"
fi
eval "$wx_cv_use_filedlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_FILEDLG=$wxUSE_FILEDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FILEDLG = yes; then
else
wx_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FINDREPLDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_finddlg='wxUSE_FINDREPLDLG=${'DEFAULT_wxUSE_FINDREPLDLG":-$defaultval}"
fi
eval "$wx_cv_use_finddlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_FINDREPLDLG=$wxUSE_FINDREPLDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FINDREPLDLG = yes; then
else
wx_cv_use_fontdlg='wxUSE_FONTDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_FONTDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_fontdlg='wxUSE_FONTDLG=${'DEFAULT_wxUSE_FONTDLG":-$defaultval}"
fi
eval "$wx_cv_use_fontdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_FONTDLG=$wxUSE_FONTDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_FONTDLG = yes; then
else
wx_cv_use_dirdlg='wxUSE_DIRDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DIRDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dirdlg='wxUSE_DIRDLG=${'DEFAULT_wxUSE_DIRDLG":-$defaultval}"
fi
eval "$wx_cv_use_dirdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_DIRDLG=$wxUSE_DIRDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DIRDLG = yes; then
else
wx_cv_use_msgdlg='wxUSE_MSGDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MSGDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_msgdlg='wxUSE_MSGDLG=${'DEFAULT_wxUSE_MSGDLG":-$defaultval}"
fi
eval "$wx_cv_use_msgdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_MSGDLG=$wxUSE_MSGDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MSGDLG = yes; then
else
wx_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_NUMBERDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_numberdlg='wxUSE_NUMBERDLG=${'DEFAULT_wxUSE_NUMBERDLG":-$defaultval}"
fi
eval "$wx_cv_use_numberdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_NUMBERDLG=$wxUSE_NUMBERDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_NUMBERDLG = yes; then
else
wx_cv_use_splash='wxUSE_SPLASH=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SPLASH=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_splash='wxUSE_SPLASH=${'DEFAULT_wxUSE_SPLASH":-$defaultval}"
fi
eval "$wx_cv_use_splash"
- if test "x$cache" = xyes; then
- echo "wxUSE_SPLASH=$wxUSE_SPLASH" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SPLASH = yes; then
else
wx_cv_use_textdlg='wxUSE_TEXTDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TEXTDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_textdlg='wxUSE_TEXTDLG=${'DEFAULT_wxUSE_TEXTDLG":-$defaultval}"
fi
eval "$wx_cv_use_textdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_TEXTDLG=$wxUSE_TEXTDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TEXTDLG = yes; then
else
wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_STARTUP_TIPS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_tipdlg='wxUSE_STARTUP_TIPS=${'DEFAULT_wxUSE_STARTUP_TIPS":-$defaultval}"
fi
eval "$wx_cv_use_tipdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_STARTUP_TIPS=$wxUSE_STARTUP_TIPS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_STARTUP_TIPS = yes; then
else
wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PROGRESSDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_progressdlg='wxUSE_PROGRESSDLG=${'DEFAULT_wxUSE_PROGRESSDLG":-$defaultval}"
fi
eval "$wx_cv_use_progressdlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_PROGRESSDLG=$wxUSE_PROGRESSDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PROGRESSDLG = yes; then
else
wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_WIZARDDLG=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_wizarddlg='wxUSE_WIZARDDLG=${'DEFAULT_wxUSE_WIZARDDLG":-$defaultval}"
fi
eval "$wx_cv_use_wizarddlg"
- if test "x$cache" = xyes; then
- echo "wxUSE_WIZARDDLG=$wxUSE_WIZARDDLG" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_WIZARDDLG = yes; then
else
wx_cv_use_menus='wxUSE_MENUS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MENUS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_menus='wxUSE_MENUS=${'DEFAULT_wxUSE_MENUS":-$defaultval}"
fi
eval "$wx_cv_use_menus"
- if test "x$cache" = xyes; then
- echo "wxUSE_MENUS=$wxUSE_MENUS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MENUS = yes; then
else
wx_cv_use_miniframe='wxUSE_MINIFRAME=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MINIFRAME=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_miniframe='wxUSE_MINIFRAME=${'DEFAULT_wxUSE_MINIFRAME":-$defaultval}"
fi
eval "$wx_cv_use_miniframe"
- if test "x$cache" = xyes; then
- echo "wxUSE_MINIFRAME=$wxUSE_MINIFRAME" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MINIFRAME = yes; then
else
wx_cv_use_tooltips='wxUSE_TOOLTIPS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TOOLTIPS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_tooltips='wxUSE_TOOLTIPS=${'DEFAULT_wxUSE_TOOLTIPS":-$defaultval}"
fi
eval "$wx_cv_use_tooltips"
- if test "x$cache" = xyes; then
- echo "wxUSE_TOOLTIPS=$wxUSE_TOOLTIPS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TOOLTIPS = yes; then
else
wx_cv_use_splines='wxUSE_SPLINES=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_SPLINES=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_splines='wxUSE_SPLINES=${'DEFAULT_wxUSE_SPLINES":-$defaultval}"
fi
eval "$wx_cv_use_splines"
- if test "x$cache" = xyes; then
- echo "wxUSE_SPLINES=$wxUSE_SPLINES" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_SPLINES = yes; then
else
wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_MOUSEWHEEL=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_mousewheel='wxUSE_MOUSEWHEEL=${'DEFAULT_wxUSE_MOUSEWHEEL":-$defaultval}"
fi
eval "$wx_cv_use_mousewheel"
- if test "x$cache" = xyes; then
- echo "wxUSE_MOUSEWHEEL=$wxUSE_MOUSEWHEEL" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_MOUSEWHEEL = yes; then
else
wx_cv_use_validators='wxUSE_VALIDATORS=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_VALIDATORS=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_validators='wxUSE_VALIDATORS=${'DEFAULT_wxUSE_VALIDATORS":-$defaultval}"
fi
eval "$wx_cv_use_validators"
- if test "x$cache" = xyes; then
- echo "wxUSE_VALIDATORS=$wxUSE_VALIDATORS" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_VALIDATORS = yes; then
else
wx_cv_use_busyinfo='wxUSE_BUSYINFO=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_BUSYINFO=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_busyinfo='wxUSE_BUSYINFO=${'DEFAULT_wxUSE_BUSYINFO":-$defaultval}"
fi
eval "$wx_cv_use_busyinfo"
- if test "x$cache" = xyes; then
- echo "wxUSE_BUSYINFO=$wxUSE_BUSYINFO" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_BUSYINFO = yes; then
else
wx_cv_use_joystick='wxUSE_JOYSTICK=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_JOYSTICK=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_joystick='wxUSE_JOYSTICK=${'DEFAULT_wxUSE_JOYSTICK":-$defaultval}"
fi
eval "$wx_cv_use_joystick"
- if test "x$cache" = xyes; then
- echo "wxUSE_JOYSTICK=$wxUSE_JOYSTICK" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_JOYSTICK = yes; then
else
wx_cv_use_metafile='wxUSE_METAFILE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_METAFILE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}"
fi
eval "$wx_cv_use_metafile"
- if test "x$cache" = xyes; then
- echo "wxUSE_METAFILE=$wxUSE_METAFILE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_METAFILE = yes; then
else
wx_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_DRAGIMAGE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_dragimage='wxUSE_DRAGIMAGE=${'DEFAULT_wxUSE_DRAGIMAGE":-$defaultval}"
fi
eval "$wx_cv_use_dragimage"
- if test "x$cache" = xyes; then
- echo "wxUSE_DRAGIMAGE=$wxUSE_DRAGIMAGE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_DRAGIMAGE = yes; then
else
wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ACCESSIBILITY=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_accessibility='wxUSE_ACCESSIBILITY=${'DEFAULT_wxUSE_ACCESSIBILITY":-$defaultval}"
fi
eval "$wx_cv_use_accessibility"
- if test "x$cache" = xyes; then
- echo "wxUSE_ACCESSIBILITY=$wxUSE_ACCESSIBILITY" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ACCESSIBILITY = yes; then
else
wx_cv_use_palette='wxUSE_PALETTE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PALETTE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_palette='wxUSE_PALETTE=${'DEFAULT_wxUSE_PALETTE":-$defaultval}"
fi
eval "$wx_cv_use_palette"
- if test "x$cache" = xyes; then
- echo "wxUSE_PALETTE=$wxUSE_PALETTE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PALETTE = yes; then
else
wx_cv_use_image='wxUSE_IMAGE=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_IMAGE=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_image='wxUSE_IMAGE=${'DEFAULT_wxUSE_IMAGE":-$defaultval}"
fi
eval "$wx_cv_use_image"
- if test "x$cache" = xyes; then
- echo "wxUSE_IMAGE=$wxUSE_IMAGE" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_IMAGE = yes; then
else
wx_cv_use_gif='wxUSE_GIF=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_GIF=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_gif='wxUSE_GIF=${'DEFAULT_wxUSE_GIF":-$defaultval}"
fi
eval "$wx_cv_use_gif"
- if test "x$cache" = xyes; then
- echo "wxUSE_GIF=$wxUSE_GIF" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_GIF = yes; then
else
wx_cv_use_pcx='wxUSE_PCX=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PCX=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_pcx='wxUSE_PCX=${'DEFAULT_wxUSE_PCX":-$defaultval}"
fi
eval "$wx_cv_use_pcx"
- if test "x$cache" = xyes; then
- echo "wxUSE_PCX=$wxUSE_PCX" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PCX = yes; then
else
wx_cv_use_tga='wxUSE_TGA=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_TGA=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_tga='wxUSE_TGA=${'DEFAULT_wxUSE_TGA":-$defaultval}"
fi
eval "$wx_cv_use_tga"
- if test "x$cache" = xyes; then
- echo "wxUSE_TGA=$wxUSE_TGA" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_TGA = yes; then
else
wx_cv_use_iff='wxUSE_IFF=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_IFF=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_iff='wxUSE_IFF=${'DEFAULT_wxUSE_IFF":-$defaultval}"
fi
eval "$wx_cv_use_iff"
- if test "x$cache" = xyes; then
- echo "wxUSE_IFF=$wxUSE_IFF" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_IFF = yes; then
else
wx_cv_use_pnm='wxUSE_PNM=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_PNM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_pnm='wxUSE_PNM=${'DEFAULT_wxUSE_PNM":-$defaultval}"
fi
eval "$wx_cv_use_pnm"
- if test "x$cache" = xyes; then
- echo "wxUSE_PNM=$wxUSE_PNM" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_PNM = yes; then
else
wx_cv_use_xpm='wxUSE_XPM=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_XPM=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_xpm='wxUSE_XPM=${'DEFAULT_wxUSE_XPM":-$defaultval}"
fi
eval "$wx_cv_use_xpm"
- if test "x$cache" = xyes; then
- echo "wxUSE_XPM=$wxUSE_XPM" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_XPM = yes; then
else
wx_cv_use_ico_cur='wxUSE_ICO_CUR=no'
fi
- cache=yes
else
- LINE=`grep "^wxUSE_ICO_CUR=" ${wx_arg_cache_file}`
- if test "x$LINE" != x ; then
- eval "DEFAULT_$LINE"
- cache=yes
- else
- cache=no
- fi
-
wx_cv_use_ico_cur='wxUSE_ICO_CUR=${'DEFAULT_wxUSE_ICO_CUR":-$defaultval}"
fi
eval "$wx_cv_use_ico_cur"
- if test "x$cache" = xyes; then
- echo "wxUSE_ICO_CUR=$wxUSE_ICO_CUR" >> ${wx_arg_cache_file}.tmp
- fi
if test x"$enablestring" = xdisable; then
if test $wxUSE_ICO_CUR = yes; then
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
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
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
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
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
echo "${ECHO_T}$result" >&6; }
+if test "$wxUSE_MSW" != 1; then
+ DEFAULT_wxUSE_AUTOID_MANAGEMENT=no
fi
- echo "saving argument cache $wx_arg_cache_file"
- mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
+ enablestring=
+ defaultval=$wxUSE_ALL_FEATURES
+ if test -z "$defaultval"; then
+ if test x"$enablestring" = xdisable; then
+ defaultval=yes
+ else
+ defaultval=no
+ fi
+ fi
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-autoidman" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-autoidman... $ECHO_C" >&6; }
+ # Check whether --enable-autoidman was given.
+if test "${enable_autoidman+set}" = set; then
+ enableval=$enable_autoidman;
+ if test "$enableval" = yes; then
+ wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=yes'
+ else
+ wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=no'
+ fi
+else
-{ echo "$as_me:$LINENO: checking for toolkit" >&5
-echo $ECHO_N "checking for toolkit... $ECHO_C" >&6; }
+ wx_cv_use_autoidman='wxUSE_AUTOID_MANAGEMENT=${'DEFAULT_wxUSE_AUTOID_MANAGEMENT":-$defaultval}"
-# In Wine, we need to default to MSW, not GTK or MOTIF
-if test "$wxUSE_WINE" = "yes"; then
- DEFAULT_DEFAULT_wxUSE_GTK=0
- DEFAULT_DEFAULT_wxUSE_MOTIF=0
- DEFAULT_DEFAULT_wxUSE_MSW=1
- wxUSE_SHARED=no
- CC=${CC:-winegcc}
- CXX=${CXX:-wineg++}
fi
-if test "$wxUSE_GUI" = "yes"; then
-
- if test "$USE_BEOS" = 1; then
- { { echo "$as_me:$LINENO: error: BeOS GUI is not supported yet, use --disable-gui" >&5
-echo "$as_me: error: BeOS GUI is not supported yet, use --disable-gui" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- if test "$TOOLKIT_GIVEN" = 1; then
- for toolkit in `echo $ALL_TOOLKITS`; do
- var=wxUSE_$toolkit
- eval "value=\$${var}"
- if test "x$value" = "xno"; then
- eval "$var=0"
- elif test "x$value" != "x"; then
- eval "$var=1"
- fi
-
- if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
- eval "wx${toolkit}_VERSION=$value"
- fi
- done
- else
- for toolkit in `echo $ALL_TOOLKITS`; do
- if test "$has_toolkit_in_cache" != 1; then
- var=DEFAULT_DEFAULT_wxUSE_$toolkit
- else
- var=DEFAULT_wxUSE_$toolkit
+ eval "$wx_cv_use_autoidman"
- eval "version=\$DEFAULT_wx${toolkit}_VERSION"
- if test "x$version" != "x"; then
- eval "wx${toolkit}_VERSION=$version"
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_AUTOID_MANAGEMENT = yes; then
+ result=no
+ else
+ result=yes
+ fi
+ else
+ result=$wxUSE_AUTOID_MANAGEMENT
fi
- fi
- eval "wxUSE_$toolkit=\$${var}"
- done
- fi
-
- NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
- + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} + ${wxUSE_MICROWIN:-0} \
- + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
- case "${host}" in
- *-pc-os2_emx | *-pc-os2-emx )
- NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
- esac
-
- case "$NUM_TOOLKITS" in
- 1)
- ;;
- 0)
- { { echo "$as_me:$LINENO: error: Please specify a toolkit -- cannot determine the default for ${host}" >&5
-echo "$as_me: error: Please specify a toolkit -- cannot determine the default for ${host}" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- *)
- { { echo "$as_me:$LINENO: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&5
-echo "$as_me: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" >&2;}
- { (exit 1); exit 1; }; }
- esac
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
- # to be removed when --disable-gtk2 isn't needed
- if test "x$wxUSE_GTK2" = "xyes"; then
- wxGTK_VERSION=2
- elif test "x$wxUSE_GTK2" = "xno"; then
- wxGTK_VERSION=1
- fi
- for toolkit in `echo $ALL_TOOLKITS`; do
- var=wxUSE_$toolkit
- eval "value=\$${var}"
- if test "x$value" != x; then
- cache_var=CACHE_$toolkit
- eval "cache=\$${cache_var}"
- if test "$cache" = 1; then
- echo "$var=$value" >> ${wx_arg_cache_file}
- eval "version=\$wx${toolkit}_VERSION"
- if test "x$version" != "x"; then
- echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
- fi
- fi
- if test "$value" = 1; then
- toolkit_echo=`echo $toolkit | tr "[A-Z]" "[a-z]"`
- { echo "$as_me:$LINENO: result: $toolkit_echo" >&5
-echo "${ECHO_T}$toolkit_echo" >&6; }
- fi
- fi
- done
-else
- if test "x$host_alias" != "x"; then
- { echo "$as_me:$LINENO: result: base ($host_alias hosted) only" >&5
-echo "${ECHO_T}base ($host_alias hosted) only" >&6; }
- else
- { echo "$as_me:$LINENO: result: base only" >&5
-echo "${ECHO_T}base only" >&6; }
- fi
fi
+ if test "$INTELCC" = "yes"; then
+
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { echo "$as_me:$LINENO: checking whether we are using Intel C compiler v8 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C compiler v8 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+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 ()
+{
+
+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800
+ choke me
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ bakefile_cv_c_compiler___INTEL_COMPILER_lt_800=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" >&6; }
+ if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_800" = "xyes"; then
+ :; INTELCC8=yes
+ else
+ :;
+ fi
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ { echo "$as_me:$LINENO: checking whether we are using Intel C compiler v10 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C compiler v10 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+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 ()
+{
+
+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000
+ choke me
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&5
+echo "${ECHO_T}$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" >&6; }
+ if test "x$bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then
+ :; INTELCC10=yes
+ else
+ :;
+ fi
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ fi
+
if test "x$GCC" != "xyes"; then
if test "xCC" = "xC"; then
{ echo "$as_me:$LINENO: checking if the C compiler requires -ext o" >&5
+ if test "$MWCC" != "yes"; then
ac_ext=c
+ fi
;;
IRIX*)
;;
Linux*)
+ if test "$INTELCC" != "yes"; then
ac_ext=c
+ fi
;;
HP-UX*)
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_prog_cxx_g=yes
+ ac_cv_prog_cxx_g=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+ if test "$GXX" = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-g"
+ fi
+else
+ if test "$GXX" = yes; then
+ CXXFLAGS="-O2"
+ else
+ CXXFLAGS=
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ { echo "$as_me:$LINENO: checking whether we are using the Intel C++ compiler" >&5
+echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+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 ()
+{
+
+ #ifndef __INTEL_COMPILER
+ choke me
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ bakefile_cv_cxx_compiler___INTEL_COMPILER=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ bakefile_cv_cxx_compiler___INTEL_COMPILER=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
+ if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
+ :; INTELCXX=yes
+ else
+ :;
+ fi
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+ if test "$INTELCXX" = "yes"; then
+
+
+ ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ { echo "$as_me:$LINENO: checking whether we are using Intel C++ compiler v8 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C++ compiler v8 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+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 ()
+{
+
+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 800
+ choke me
+ #endif
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
+ bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
- CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
- if test "$GXX" = yes; then
- CXXFLAGS="-g -O2"
- else
- CXXFLAGS="-g"
- fi
-else
- if test "$GXX" = yes; then
- CXXFLAGS="-O2"
- else
- CXXFLAGS=
- fi
-fi
-ac_ext=c
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" >&6; }
+ if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800" = "xyes"; then
+ :; INTELCXX8=yes
+ else
+ :;
+ fi
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- { echo "$as_me:$LINENO: checking whether we are using the Intel C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the Intel C++ compiler... $ECHO_C" >&6; }
-if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then
+ { echo "$as_me:$LINENO: checking whether we are using Intel C++ compiler v10 or later" >&5
+echo $ECHO_N "checking whether we are using Intel C++ compiler v10 or later... $ECHO_C" >&6; }
+if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
main ()
{
- #ifndef __INTEL_COMPILER
+ #ifndef __INTEL_COMPILER || __INTEL_COMPILER < 1000
choke me
#endif
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- bakefile_cv_cxx_compiler___INTEL_COMPILER=yes
+ bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- bakefile_cv_cxx_compiler___INTEL_COMPILER=no
+ bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000=no
fi
fi
-{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER" >&5
-echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER" >&6; }
- if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER" = "xyes"; then
- :; INTELCXX=yes
+{ echo "$as_me:$LINENO: result: $bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&5
+echo "${ECHO_T}$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" >&6; }
+ if test "x$bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000" = "xyes"; then
+ :; INTELCXX10=yes
else
:;
fi
+ fi
if test "x$GCXX" != "xyes"; then
if test "xCXX" = "xC"; then
+ if test "$MWCXX" != "yes"; then
ac_ext=cpp
+ fi
;;
IRIX*)
;;
Linux*)
+ if test "$INTELCXX" != "yes"; then
ac_ext=cpp
+ fi
;;
HP-UX*)
OSX_UNIV_OPTS="-arch ppc -arch i386"
CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
+ OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS"
+ OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS"
LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
retest_macosx_linking=yes
else
wxUSE_MACOSX_VERSION_MIN=
fi
+elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then
+ if test "$wxUSE_MAC" = 1; then
+ # otherwise configure stops on leopard for universal_binary
+ wxUSE_MACOSX_VERSION_MIN=10.4
+ fi
fi
if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
_ACEOF
- if test "$ac_cv_sizeof_long_long" != "0"; then
+ if test "$ac_cv_sizeof_long_long" != 0; then
CPPFLAGS="-D_INCLUDE_LONGLONG $CPPFLAGS"
fi
;;
_ACEOF
-if test "$ac_cv_sizeof_wchar_t" != "0"; then
+if test "$ac_cv_sizeof_wchar_t" != 0; then
wxUSE_WCHAR_T=yes
else
wxUSE_WCHAR_T=no
fi
fi
+
+LARGEFILE_CPPFLAGS=
# Check whether --enable-largefile was given.
if test "${enable_largefile+set}" = set; then
enableval=$enable_largefile;
echo "${ECHO_T}$wx_largefile" >&6; }
fi
+if test "$ac_cv_sys_file_offset_bits" = "64"; then
+ LARGEFILE_CPPFLAGS="-D_FILE_OFFSET_BITS=64"
+elif test "$ac_cv_sys_large_files" = 1; then
+ LARGEFILE_CPPFLAGS="-D_LARGE_FILES"
+fi
-if test "x$wx_largefile" = "xyes"; then
- if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
- WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+if test -n "$LARGEFILE_CPPFLAGS"; then
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS $LARGEFILE_CPPFLAGS"
- if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
- { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5
+ if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then
+ { echo "$as_me:$LINENO: checking if -D__STDC_EXT__ is required" >&5
echo $ECHO_N "checking if -D__STDC_EXT__ is required... $ECHO_C" >&6; }
if test "${wx_cv_STDC_EXT_required+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ac_ext=cpp
+ ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
main ()
{
- #ifndef __STDC_EXT__
- choke me
- #endif
+ #ifndef __STDC_EXT__
+ choke me
+ #endif
;
return 0;
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
+ 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'
fi
{ echo "$as_me:$LINENO: result: $wx_cv_STDC_EXT_required" >&5
echo "${ECHO_T}$wx_cv_STDC_EXT_required" >&6; }
- if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
- WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
- fi
+ if test "x$wx_cv_STDC_EXT_required" = "xyes"; then
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -D__STDC_EXT__"
fi
- else
- WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGE_FILES"
fi
- { echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+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
+
+old_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS"
+{ echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6; }
if test "${ac_cv_sys_largefile_source+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
fi
- if test "$ac_cv_sys_largefile_source" != no; then
- WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
- fi
+CPPFLAGS="$old_CPPFLAGS"
+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 "$ac_cv_sys_largefile_source" != no; then
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
fi
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- { echo "$as_me:$LINENO: checking if C++ compiler supports bool" >&5
-echo $ECHO_N "checking if C++ compiler supports bool... $ECHO_C" >&6; }
-if test "${wx_cv_cpp_bool+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-
-int
-main ()
-{
-
- bool b = true;
-
- return 0;
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
- wx_cv_cpp_bool=yes
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- wx_cv_cpp_bool=no
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_cpp_bool" >&5
-echo "${ECHO_T}$wx_cv_cpp_bool" >&6; }
-
- if test "$wx_cv_cpp_bool" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_BOOL 1
-_ACEOF
-
- fi
-
-
-
{ echo "$as_me:$LINENO: checking if C++ compiler supports the explicit keyword" >&5
echo $ECHO_N "checking if C++ compiler supports the explicit keyword... $ECHO_C" >&6; }
if test "${wx_cv_explicit+set}" = set; then
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_explicit=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- wx_cv_explicit=yes
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- wx_cv_explicit=no
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_explicit" >&5
-echo "${ECHO_T}$wx_cv_explicit" >&6; }
-
- if test "$wx_cv_explicit" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXPLICIT 1
-_ACEOF
-
- fi
-
-
-{ echo "$as_me:$LINENO: checking whether the compiler supports const_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports const_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_const_cast+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-int
-main ()
-{
-int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
- ;
- 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
- ac_cv_cxx_const_cast=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_cxx_const_cast=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_const_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_const_cast" >&6; }
-if test "$ac_cv_cxx_const_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CONST_CAST
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking whether the compiler supports reinterpret_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports reinterpret_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_reinterpret_cast+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <typeinfo>
-class Base { public : Base () {} virtual void f () = 0;};
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-class Unrelated { public : Unrelated () {} };
-int g (Unrelated&) { return 0; }
-int
-main ()
-{
-
-Derived d;Base& b=d;Unrelated& e=reinterpret_cast<Unrelated&>(b);return g(e);
- ;
- 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
- ac_cv_cxx_reinterpret_cast=yes
+ wx_cv_explicit=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_cxx_reinterpret_cast=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_reinterpret_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_reinterpret_cast" >&6; }
-if test "$ac_cv_cxx_reinterpret_cast" = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REINTERPRET_CAST
-_ACEOF
+ wx_cv_explicit=yes
fi
-{ echo "$as_me:$LINENO: checking whether the compiler supports static_cast<>" >&5
-echo $ECHO_N "checking whether the compiler supports static_cast<>... $ECHO_C" >&6; }
-if test "${ac_cv_cxx_static_cast+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <typeinfo>
-class Base { public : Base () {} virtual void f () = 0; };
-class Derived : public Base { public : Derived () {} virtual void f () {} };
-int g (Derived&) { return 0; }
-int
-main ()
-{
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-Derived d; Base& b = d; Derived& s = static_cast<Derived&> (b); return g (s);
- ;
- 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
- ac_cv_cxx_static_cast=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_cxx_static_cast=no
+ wx_cv_explicit=no
+
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
+
+ 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'
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_static_cast" >&5
-echo "${ECHO_T}$ac_cv_cxx_static_cast" >&6; }
-if test "$ac_cv_cxx_static_cast" = yes; then
+{ echo "$as_me:$LINENO: result: $wx_cv_explicit" >&5
+echo "${ECHO_T}$wx_cv_explicit" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STATIC_CAST
+ if test "$wx_cv_explicit" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_EXPLICIT 1
_ACEOF
-fi
+ fi
if test "x$SUNCXX" = xyes; then
CFLAGS="+W 2011,2450 $CFLAGS"
fi
if test "x$HPCXX" = "xyes"; then
- CXXFLAGS="+W 2340 $CXXFLAGS"
+ CXXFLAGS="+W 2340,4232 $CXXFLAGS"
fi
if test "x$COMPAQCXX" = "xyes"; then
{ { echo "$as_me:$LINENO: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&5
echo "$as_me: error: Can't use --enable-stl without $std_string or std::basic_string<$char_type>" >&2;}
{ (exit 1); exit 1; }; }
- elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
+ elif test "$wxUSE_STD_STRING" = "yes"; then
{ { echo "$as_me:$LINENO: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&5
echo "$as_me: error: Can't use --enable-std_string without $std_string or std::basic_string<$char_type>" >&2;}
{ (exit 1); exit 1; }; }
if test "$wxUSE_STD_IOSTREAM" != "yes"; then
- if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
+ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
{ { echo "$as_me:$LINENO: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&5
echo "$as_me: error: Can't use --enable-std_iostreams without std::istream and std::ostream" >&2;}
{ (exit 1); exit 1; }; }
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_func_stdstring_compare=yes
+ wx_cv_func_stdstring_compare=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_func_stdstring_compare=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
+echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
+
+ if test "$wx_cv_func_stdstring_compare" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_STRING_COMPARE 1
+_ACEOF
+
+ fi
+
+ if test "$wx_cv_class_gnuhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_EXT_HASH_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_GNU_CXX_HASH_MAP 1
+_ACEOF
+
+ fi
+
+ { echo "$as_me:$LINENO: checking for unordered_map" >&5
+echo $ECHO_N "checking for unordered_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_unordered_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+
+#include <unordered_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_unordered_map=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_unordered_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_unordered_map" >&5
+echo "${ECHO_T}$ac_cv_header_unordered_map" >&6; }
+if test $ac_cv_header_unordered_map = yes; then
+ { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std" >&5
+echo $ECHO_N "checking for unordered_map and unordered_set in std... $ECHO_C" >&6; }
+if test "${wx_cv_class_stdunorderedmapset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <unordered_map>
+ #include <unordered_set>
+int
+main ()
+{
+std::unordered_map<double*, char*> test1;
+ std::unordered_set<char*> test2;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_class_stdunorderedmapset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_class_stdunorderedmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdunorderedmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdunorderedmapset" >&6; }
+fi
+
+
+
+ if test "$wx_cv_class_stdunorderedmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_UNORDERED_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_UNORDERED_SET 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: checking for tr1/unordered_map" >&5
+echo $ECHO_N "checking for tr1/unordered_map... $ECHO_C" >&6; }
+if test "${ac_cv_header_tr1_unordered_map+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+
+#include <tr1/unordered_map>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_header_tr1_unordered_map=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_tr1_unordered_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_tr1_unordered_map" >&5
+echo "${ECHO_T}$ac_cv_header_tr1_unordered_map" >&6; }
+if test $ac_cv_header_tr1_unordered_map = yes; then
+ { echo "$as_me:$LINENO: checking for unordered_map and unordered_set in std::tr1" >&5
+echo $ECHO_N "checking for unordered_map and unordered_set in std::tr1... $ECHO_C" >&6; }
+if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <tr1/unordered_map>
+ #include <tr1/unordered_set>
+int
+main ()
+{
+std::tr1::unordered_map<double*, char*> test1;
+ std::tr1::unordered_set<char*> test2;
+ #if defined(__GNUC__) && (__GNUC__==4) && (__GNUC_MINOR__<2)
+ #error can't use unordered_{map,set} with gcc-4.[01]: http://gcc.gnu.org/PR24389
+ #endif
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_class_tr1unorderedmapset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_func_stdstring_compare=no
-
+ wx_cv_class_tr1unorderedmapset=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_tr1unorderedmapset" >&5
+echo "${ECHO_T}$wx_cv_class_tr1unorderedmapset" >&6; }
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_stdstring_compare" >&5
-echo "${ECHO_T}$wx_cv_func_stdstring_compare" >&6; }
- if test "$wx_cv_func_stdstring_compare" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_STRING_COMPARE 1
+
+
+ if test "$wx_cv_class_tr1unorderedmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TR1_UNORDERED_MAP 1
_ACEOF
- fi
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_TR1_UNORDERED_SET 1
+_ACEOF
- { echo "$as_me:$LINENO: checking for hash_map" >&5
+ else
+ { echo "$as_me:$LINENO: checking for hash_map" >&5
echo $ECHO_N "checking for hash_map... $ECHO_C" >&6; }
if test "${ac_cv_header_hash_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
{ echo "$as_me:$LINENO: result: $ac_cv_header_hash_map" >&5
echo "${ECHO_T}$ac_cv_header_hash_map" >&6; }
if test $ac_cv_header_hash_map = yes; then
- { echo "$as_me:$LINENO: checking for standard hash_map and hash_set" >&5
-echo $ECHO_N "checking for standard hash_map and hash_set... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for std::hash_map and hash_set" >&5
+echo $ECHO_N "checking for std::hash_map and hash_set... $ECHO_C" >&6; }
if test "${wx_cv_class_stdhashmapset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <hash_map>
- #include <hash_set>
+ #include <hash_set>
int
main ()
{
std::hash_map<double*, char*, std::hash<double*>, std::equal_to<double*> > test1;
- std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
+ std::hash_set<char*, std::hash<char*>, std::equal_to<char*> > test2;
;
return 0;
}
- if test "$wx_cv_class_stdhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wx_cv_class_stdhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_HASH_MAP 1
_ACEOF
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_STD_HASH_MAP 1
_ACEOF
- fi
+ fi
- { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
+ { echo "$as_me:$LINENO: checking for ext/hash_map" >&5
echo $ECHO_N "checking for ext/hash_map... $ECHO_C" >&6; }
if test "${ac_cv_header_ext_hash_map+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ext/hash_map>
- #include <ext/hash_set>
+ #include <ext/hash_set>
int
main ()
{
__gnu_cxx::hash_map<double*, char*, __gnu_cxx::hash<double*>, std::equal_to<double*> > test1;
- __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
+ __gnu_cxx::hash_set<char*, __gnu_cxx::hash<char*>, std::equal_to<char*> > test2;
;
return 0;
}
- if test "$wx_cv_class_gnuhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXT_HASH_MAP 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_GNU_CXX_HASH_MAP 1
-_ACEOF
-
+ fi
fi
fi
if test -n "$GCC"; then
- { echo "$as_me:$LINENO: checking for __sync_fetch_* builtins" >&5
-echo $ECHO_N "checking for __sync_fetch_* builtins... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5
+echo $ECHO_N "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... $ECHO_C" >&6; }
if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
main ()
{
- int value=0;
- __sync_fetch_and_add(&value, 1);
+ unsigned int value=0;
+ /* wxAtomicInc doesn't use return value here */
+ __sync_fetch_and_add(&value, 2);
__sync_sub_and_fetch(&value, 1);
+ /* but wxAtomicDec does, so mimic that: */
+ unsigned int r2 = __sync_sub_and_fetch(&value, 1);
;
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
wx_cv_cc_gcc_atomic_builtins=yes
else
echo "$as_me: failed program was:" >&5
wx_cv_cc_gcc_atomic_builtins=no
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
SEARCH_INCLUDE="\
/usr/local/include \
+ /usr/local/X11/include \
+ /usr/local/include/X11 \
+ /usr/local/X11R6/include \
+ /usr/local/include/X11R6 \
\
/usr/Motif-2.1/include \
/usr/Motif-1.2/include \
\
/usr/X11R6/include \
/usr/X11R6.4/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
\
/usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
\
/usr/X11/include \
/usr/include/X11 \
- /usr/local/X11/include \
- /usr/local/include/X11 \
\
/usr/XFree86/include/X11 \
/usr/pkg/include \
\
+ /usr/local/X1R5/include \
+ /usr/local/include/X11R5 \
+ /usr/X11R5/include \
+ /usr/include/X11R5 \
+ \
+ /usr/local/X11R4/include \
+ /usr/local/include/X11R4 \
+ /usr/X11R4/include \
+ /usr/include/X11R4 \
+ \
/usr/openwin/share/include"
{ echo "$as_me:$LINENO: checking for libraries directory" >&5
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then
- { echo "$as_me:$LINENO: WARNING: Defaulting to the the builtin regex library for Unicode build." >&5
-echo "$as_me: WARNING: Defaulting to the the builtin regex library for Unicode build." >&2;}
+ { echo "$as_me:$LINENO: WARNING: Defaulting to the builtin regex library for Unicode build." >&5
+echo "$as_me: WARNING: Defaulting to the builtin regex library for Unicode build." >&2;}
wxUSE_REGEX=builtin
fi
fi
fi
if test "$wxUSE_LIBTIFF" = "builtin" ; then
+ if test "$wxUSE_LIBJPEG" = "no"; then
+ ac_configure_args="$ac_configure_args --disable-jpeg"
+ fi
subdirs="$subdirs src/tiff"
fi
+ case "${host}" in
+ x86_64-*-mingw32* )
+ LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+ ;;
+ * )
LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-
+ ;;
+ esac
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
LIBS="$LIBS -loleacc"
fi
WXGTK12=
WXGTK127=
- WXGTK20=
+ WXGTK2=
WXGPE=
if test "$wxUSE_COCOA" = 1 ; then
no_gtk=yes
fi
- min_gtk_version=2.0.0
+ min_gtk_version=2.4.0
{ echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
echo $ECHO_N "checking for GTK+ - version >= $min_gtk_version... $ECHO_C" >&6; }
fi
case "$wx_cv_lib_gtk" in
- 2.0) WXGTK20=1
+ 2.0) WXGTK2=1
TOOLKIT_VERSION=2
;;
1.2.7) WXGTK127=1
;;
esac
- if test "$WXGTK20" = 1; then
+ if test "$WXGTK2" = 1; then
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
LIBS="$LIBS $wx_cv_libs_gtk"
- { echo "$as_me:$LINENO: checking whether gtk_icon_size_lookup is declared" >&5
-echo $ECHO_N "checking whether gtk_icon_size_lookup is declared... $ECHO_C" >&6; }
-if test "${ac_cv_have_decl_gtk_icon_size_lookup+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <gtk/gtk.h>
-
-int
-main ()
-{
-#ifndef gtk_icon_size_lookup
- (void) gtk_icon_size_lookup;
-#endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_have_decl_gtk_icon_size_lookup=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_have_decl_gtk_icon_size_lookup=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_gtk_icon_size_lookup" >&5
-echo "${ECHO_T}$ac_cv_have_decl_gtk_icon_size_lookup" >&6; }
-if test $ac_cv_have_decl_gtk_icon_size_lookup = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
-
-
-else
- cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_GTK_ICON_SIZE_LOOKUP 0
-_ACEOF
-
-cat >>confdefs.h <<\_ACEOF
-#define NEED_GTK_ICON_SIZE_LOOKUP 1
-_ACEOF
-
-fi
-
-
-
-
{ echo "$as_me:$LINENO: checking if GTK+ is version >= 2.10" >&5
echo $ECHO_N "checking if GTK+ is version >= 2.10... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
-_ACEOF
-
- cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- if test "$ac_wxgtk26" = 0; then
- { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.4" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.4... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <gtk/gtk.h>
-
-int
-main ()
-{
-
- #if !GTK_CHECK_VERSION(2,4,0)
- Not GTK+ 2.4
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
- cat >>confdefs.h <<\_ACEOF
-#define __WXGTK24__ 1
-_ACEOF
-
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
libsm_ice_link=""
libs_found=0
for libp in "" " -lXp"; do
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = 0; then
for libsm_ice in "" " -lSM -lICE"; do
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = 0; then
save_LIBS="$LIBS"
LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
save_CFLAGS=$CFLAGS
fi
done
- if test "$libs_found" = "0"; then
+ if test "$libs_found" = 0; then
{ echo "$as_me:$LINENO: result: can't find the right libraries" >&5
echo "${ECHO_T}can't find the right libraries" >&6; }
{ { echo "$as_me:$LINENO: error: can't link a simple motif program" >&5
fi
fi
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_OSX_CARBON" = 1; then
{ echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6; }
if test "$GCC" = yes; then
CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
fi
- TOOLKIT=MAC
- GUIDIST=MACX_DIST
+ TOOLKIT=OSX_CARBON
+ GUIDIST=OSX_CARBON_DIST
WXBASEPORT="_carbon"
fi
+ if test "$wxUSE_OSX_COCOA" = 1; then
+ TOOLKIT=OSX_COCOA
+ GUIDIST=OSX_COCOA_DIST
+ fi
+
if test "$wxUSE_COCOA" = 1; then
TOOLKIT=COCOA
GUIDIST=COCOA_DIST
if test "$TOOLKIT" = "PM" ; then
TOOLKIT_DIR="os2"
else
- TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+ TOOLKIT_DIR=`echo ${TOOLKIT} | tr '[A-Z]' '[a-z]'`
fi
if test "$wxUSE_UNIVERSAL" = "yes"; then
if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then
- if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then
+ if test "$USE_UNIX" = 1 -a "$wxUSE_DARWIN" != 1 ; then
wxUSE_UNICODE_UTF8=yes
- elif test "$USE_OS2" = "1" ; then
+ elif test "$USE_OS2" = 1 ; then
wxUSE_UNICODE_UTF8=yes
else
wxUSE_UNICODE_UTF8=no
USE_OPENGL=0
-if test "$wxUSE_OPENGL" = "yes"; then
- if test "$wxUSE_MGL" = 1 -o "$wxUSE_DFB" = "1"; then
- { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
-echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
- wxUSE_OPENGL="no"
- elif test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+if test "$wxUSE_OPENGL" = "yes" -o "$wxUSE_OPENGL" = "auto"; then
+
+
+ if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
- else
+ elif test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK2" = 1 -o "$wxUSE_GTK" = 1; then
+
{ echo "$as_me:$LINENO: checking for OpenGL headers" >&5
echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
if test "x$OPENGL_LIBS" = "x"; then
- { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
+ if test "$wxUSE_OPENGL" = "yes"; then
+ { { echo "$as_me:$LINENO: error: OpenGL libraries not available" >&5
echo "$as_me: error: OpenGL libraries not available" >&2;}
{ (exit 1); exit 1; }; }
+ else
+ { echo "$as_me:$LINENO: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&5
+echo "$as_me: WARNING: OpenGL libraries not available, disabling support for OpenGL" >&2;}
+ wxUSE_OPENGL=no
+ USE_OPENGL=0
+ fi
+ else
+ wxUSE_OPENGL=yes
fi
+ else
+ { echo "$as_me:$LINENO: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&5
+echo "$as_me: WARNING: wxGLCanvas not implemented for this port, library will be compiled without it." >&2;}
+ wxUSE_OPENGL="no"
fi
if test "$wxUSE_OPENGL" = "yes"; then
;;
*-*-darwin* )
- install_name_tool=`which install_name_tool`
+ install_name_tool=`which ${HOST_PREFIX}install_name_tool`
if test "$install_name_tool" -a -x "$install_name_tool"; then
- SAMPLES_RPATH_POSTLINK="\$(wx_top_builddir)/change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
cat <<EOF >change-install-names
#!/bin/sh
libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\`
-inst_cmd="install_name_tool "
for i in \${libnames} ; do
- inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+ ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i}
+ for dep in \${libnames} ; do
+ ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i}
+ done
done
-\${inst_cmd} \${3}
EOF
chmod +x change-install-names
+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib"
fi
+
+ HEADER_PAD_OPTION="-headerpad_max_install_names"
;;
*-*-cygwin* | *-*-mingw32* )
if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG=''
- SAMPLES_RPATH_POSTLINK=''
+ DYLIB_PATH_POSTLINK=''
WXCONFIG_RPATH=''
fi
DEBUG_INFO=1
fi
-WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr '[a-z]' '[A-Z]'`
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}"
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
-TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
+TOOLCHAIN_FULLNAME="${HOST_PREFIX}${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}"
-if test "$cross_compiling" = "yes"; then
- HOST_SUFFIX="-$host_alias"
- TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX"
- TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME"
-fi
-WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then
+ WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+else
+ WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+fi
if test "${TOOLKIT_DIR}" = "os2"; then
WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
else
fi
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
- echo $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 <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "uid_t" >/dev/null 2>&1; then
- ac_cv_type_uid_t=yes
-else
- ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
{ echo "$as_me:$LINENO: checking for ssize_t" >&5
echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6; }
fi
-for ac_func in wcsdup
+
+
+
+
+for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-for ac_func in snprintf vsnprintf
+
+for ac_func in snprintf vsnprintf vsscanf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
done
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
if test "$ac_cv_func_vsnprintf" = "yes"; then
{ echo "$as_me:$LINENO: checking for vsnprintf declaration" >&5
echo $ECHO_N "checking for vsnprintf declaration... $ECHO_C" >&6; }
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_vsnprintf_decl=yes
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_broken_vsnprintf_decl=no
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
+ test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
wx_cv_func_snprintf_decl=yes
fi
fi
+if test "$ac_cv_func_vsscanf" = "yes"; then
+ { echo "$as_me:$LINENO: checking for vsscanf declaration" >&5
+echo $ECHO_N "checking for vsscanf declaration... $ECHO_C" >&6; }
+if test "${wx_cv_func_vsscanf_decl+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #include <stdio.h>
+ #include <stdarg.h>
+ #ifdef __MSL__
+ #if __MSL__ >= 0x6000
+ namespace std {}
+ using namespace std;
+ #endif
+ #endif
+
+int
+main ()
+{
+
+ char *buf;
+ va_list args;
+ vsscanf(buf, "%s", args);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_func_vsscanf_decl=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_func_vsscanf_decl=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_func_vsscanf_decl" >&5
+echo "${ECHO_T}$wx_cv_func_vsscanf_decl" >&6; }
+
+ if test "$wx_cv_func_vsscanf_decl" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_VSSCANF_DECL 1
+_ACEOF
+
+ fi
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
if test "$wxUSE_UNICODE" = yes; then
wchar_headers="#include <stdio.h>
esac
- for wx_func in putws fputws wprintf vswprintf
+ for wx_func in putws fputws wprintf vswprintf vswscanf
do
{ echo "$as_me:$LINENO: checking for $wx_func" >&5
echo $ECHO_N "checking for $wx_func... $ECHO_C" >&6; }
if test "$TOOLKIT" != "MSW"; then
-
+if test "$wxUSE_LIBICONV" != "no" ; then
fi
-LIBS="$LIBICONV $LIBS"
+ LIBS="$LIBICONV $LIBS"
+fi
if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
fi
fi
-if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != 1 -a "$USE_UNIX" != 1; then
{ echo "$as_me:$LINENO: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&5
echo "$as_me: WARNING: wxStackWalker is only available on Win32 and UNIX... disabled" >&2;}
wxUSE_STACKWALKER=no
{ echo "$as_me:$LINENO: WARNING: wxMutex won't be recursive on this platform" >&5
echo "$as_me: WARNING: wxMutex won't be recursive on this platform" >&2;}
fi
+ fi
+
+ { echo "$as_me:$LINENO: checking for __thread keyword" >&5
+echo $ECHO_N "checking for __thread keyword... $ECHO_C" >&6; }
+if test "${wx_cv_cc___thread+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <pthread.h>
+int
+main ()
+{
+
+ static __thread int n = 0;
+ static __thread int *p = 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ wx_cv_cc___thread=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_cc___thread=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_cc___thread" >&5
+echo "${ECHO_T}$wx_cv_cc___thread" >&6; }
+
+ if test "$wx_cv_cc___thread" = "yes"; then
+
+ GXX_VERSION=""
+
+
+
+ { echo "$as_me:$LINENO: checking if gcc accepts -dumpversion option" >&5
+echo $ECHO_N "checking if gcc accepts -dumpversion option... $ECHO_C" >&6; }
+
+ if test "x$GCC" = "xyes" ; then
+
+ if test -z "" ; then
+
+ ax_gcc_option_test="int main()
+{
+ return 0;
+}"
+
+else
+
+ ax_gcc_option_test=""
+
+fi
+
+
+ # Dump the test program to file
+ cat <<EOF > conftest.c
+$ax_gcc_option_test
+EOF
+
+ # Dump back the file to the log, useful for debugging purposes
+ { ac_try='cat conftest.c 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }
+
+ if { ac_try='$CC -dumpversion -c conftest.c 1>&5'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } ; then
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+ ax_gcc_version_option=yes
+
+
+else
+
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+ ax_gcc_version_option=no
+
+
+fi
+
+
+else
+
+ { echo "$as_me:$LINENO: result: no gcc available" >&5
+echo "${ECHO_T}no gcc available" >&6; }
+
+fi
+
+
+ if test "x$GXX" = "xyes"; then
+
+ if test "x$ax_gxx_version_option" != "no"; then
+
+ { echo "$as_me:$LINENO: checking gxx version" >&5
+echo $ECHO_N "checking gxx version... $ECHO_C" >&6; }
+if test "${ax_cv_gxx_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ ax_cv_gxx_version="`$CXX -dumpversion`"
+ if test "x$ax_cv_gxx_version" = "x"; then
+
+ ax_cv_gxx_version=""
+
+fi
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ax_cv_gxx_version" >&5
+echo "${ECHO_T}$ax_cv_gxx_version" >&6; }
+ GXX_VERSION=$ax_cv_gxx_version
+
+fi
+
+
+fi
+
+
+
+ if test -n "$ax_cv_gxx_version"; then
+ { echo "$as_me:$LINENO: checking whether __thread support in g++ is usable" >&5
+echo $ECHO_N "checking whether __thread support in g++ is usable... $ECHO_C" >&6; }
+ case "$ax_cv_gxx_version" in
+ 1.* | 2.* | 3.* )
+ { echo "$as_me:$LINENO: result: no, it's broken" >&5
+echo "${ECHO_T}no, it's broken" >&6; }
+ wx_cv_cc___thread=no
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: yes, it works" >&5
+echo "${ECHO_T}yes, it works" >&6; }
+ ;;
+ esac
+ fi
+ fi
+
+ if test "$wx_cv_cc___thread" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE___THREAD_KEYWORD 1
+_ACEOF
+
fi
fi
else
if test "$wxUSE_THREADS" = "yes" ; then
case "${host}" in
+ x86_64-*-mingw32* )
+ ;;
*-*-mingw32* )
{ echo "$as_me:$LINENO: checking if compiler supports -mthreads" >&5
echo $ECHO_N "checking if compiler supports -mthreads... $ECHO_C" >&6; }
fi
fi
-if test "$WXGTK20" = 1 ; then
+if test "$WXGTK2" = 1 ; then
cat >>confdefs.h <<_ACEOF
-#define __WXGTK20__ $WXGTK20
+#define __WXGTK20__ $WXGTK2
_ACEOF
WXGTK12=1
fi
DEBUG_CFLAGS=
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+if `echo $CXXFLAGS $CFLAGS | grep " -g" >/dev/null`; then
+ { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&5
+echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -g flag; ignoring the --enable-debug_info option" >&2;}
+elif test "$wxUSE_DEBUG_INFO" = "yes" ; then
DEBUG_CFLAGS="-g"
- wxUSE_OPTIMISE=no
fi
if test "$wxUSE_DEBUG_GDB" = "yes" ; then
fi
OPTIMISE_CFLAGS=
-if test "$wxUSE_OPTIMISE" = "no" ; then
- if test "$GCC" = yes ; then
- OPTIMISE_CFLAGS="-O0"
- fi
+if `echo $CXXFLAGS $CFLAGS | grep " -O" >/dev/null`; then
+ { echo "$as_me:$LINENO: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&5
+echo "$as_me: WARNING: CXXFLAGS/CFLAGS already contains -O flag; ignoring the --disable-optimise option" >&2;}
else
- if test "$GCC" = yes ; then
- case "${host}" in
- *-pc-os2_emx | *-pc-os2-emx )
- OPTIMISE_CFLAGS="-O2"
- ;;
- *)
- OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
- ;;
- esac
+ if test "$wxUSE_OPTIMISE" = "no" ; then
+ if test "$GCC" = yes ; then
+ OPTIMISE_CFLAGS="-O0"
+ fi
else
- OPTIMISE_CFLAGS="-O"
+ if test "$GCC" = yes ; then
+ case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ OPTIMISE_CFLAGS="-O2"
+ ;;
+ *)
+ OPTIMISE_CFLAGS="-O2 -fno-strict-aliasing"
+ ;;
+ esac
+ else
+ OPTIMISE_CFLAGS="-O"
+ fi
fi
fi
HAVE_DL_FUNCS=0
HAVE_SHL_FUNCS=0
if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then
- if test "$USE_DARWIN" = 1; then
- HAVE_DL_FUNCS=1
- elif test "$USE_DOS" = 1; then
+ if test "$USE_DOS" = 1; then
HAVE_DL_FUNCS=0
else
done
- if test "$HAVE_DL_FUNCS" = 1; then
+ if test "$HAVE_DL_FUNCS" = 1; then
for ac_func in dlerror
do
else
- { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
+ { echo "$as_me:$LINENO: checking for dlerror in -ldl" >&5
echo $ECHO_N "checking for dlerror in -ldl... $ECHO_C" >&6; }
if test "${ac_cv_lib_dl_dlerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
done
+ fi
fi
+
+ if test "$USE_DARWIN" = 1; then
+ HAVE_DL_FUNCS=1
fi
if test "$HAVE_DL_FUNCS" = 0; then
fi
-if test "$USE_UNIX" = "1" ; then
+if test "$USE_UNIX" = 1 ; then
if test "$wxUSE_MGL" != 1; then
{ echo "$as_me:$LINENO: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5
echo $ECHO_N "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... $ECHO_C" >&6; }
WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then
- if test "$USE_UNIX" = "1" ; then
+ if test "$USE_UNIX" = 1 ; then
if test "$wxUSE_LIBSDL" != "no"; then
# Check whether --with-sdl-prefix was given.
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
fi
-if test "$WXGTK20" = 1; then
+if test "$WXGTK2" = 1; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
fi
if test "$wxUSE_DEBUGREPORT" = "yes"; then
- if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+ if test "$USE_UNIX" != 1 -a "$USE_WIN32" != 1; then
{ echo "$as_me:$LINENO: WARNING: Creating debug reports not currently supported on this system, disabled" >&5
echo "$as_me: WARNING: Creating debug reports not currently supported on this system, disabled" >&2;}
wxUSE_DEBUGREPORT=no
fi
fi
+if test "$wxUSE_XLOCALE" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_XLOCALE 1
+_ACEOF
+
+ { echo "$as_me:$LINENO: checking for locale_t" >&5
+echo $ECHO_N "checking for locale_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_locale_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <xlocale.h>
+ #include <locale.h>
+
+typedef locale_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_locale_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_locale_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_locale_t" >&5
+echo "${ECHO_T}$ac_cv_type_locale_t" >&6; }
+if test $ac_cv_type_locale_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LOCALE_T 1
+_ACEOF
+
+
+fi
+
+fi
+
if test "$wxUSE_LOG" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LOG 1
if test "$wxUSE_SOCKETS" = "yes"; then
- if test "$wxUSE_MGL" = "1"; then
+ if test "$wxUSE_MGL" = 1; then
{ echo "$as_me:$LINENO: WARNING: wxSocket not yet supported under MGL... disabled" >&5
echo "$as_me: WARNING: wxSocket not yet supported under MGL... disabled" >&2;}
wxUSE_SOCKETS="no"
fi
if test "$wxUSE_SOCKETS" = "yes" ; then
+ if test "$wxUSE_IPV6" = "yes"; then
+ { echo "$as_me:$LINENO: checking whether we have sockaddr_in6" >&5
+echo $ECHO_N "checking whether we have sockaddr_in6... $ECHO_C" >&6; }
+if test "${wx_cv_type_sockaddr_in6+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+
+int
+main ()
+{
+
+ struct sockaddr_in6 sa6;
+
+ ;
+ 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_type_sockaddr_in6=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_type_sockaddr_in6=no
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_type_sockaddr_in6" >&5
+echo "${ECHO_T}$wx_cv_type_sockaddr_in6" >&6; }
+
+ if test "$wx_cv_type_sockaddr_in6"="yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_IPV6 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: WARNING: IPv6 support not available... disabled" >&5
+echo "$as_me: WARNING: IPv6 support not available... disabled" >&2;}
+ fi
+ fi
+
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SOCKETS 1
_ACEOF
if test "$TOOLKIT" = "MSW"; then
wxUSE_JOYSTICK=yes
- elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+ elif test "$TOOLKIT" = "OSX" -o "$TOOLKIT" = "COCOA"; then
if test "$USE_DARWIN" = 1; then
{ echo "$as_me:$LINENO: checking headers have declarations needed for joystick support" >&5
echo $ECHO_N "checking headers have declarations needed for joystick support... $ECHO_C" >&6; }
fi
else
- if test "$wxUSE_MGL" != "1"; then
+ if test "$wxUSE_MGL" != 1; then
for ac_header in linux/joystick.h
do
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
- if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
- fi
fi
if test "$wxUSE_HELP" = "yes"; then
fi
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&5
-echo "$as_me: WARNING: Printing support cannot be used without constraints so it won't be compiled without it" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_PRINTING_ARCHITECTURE 1
_ACEOF
- fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
fi
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
fi
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS clipboard"
+fi
+
if test "$wxUSE_SPLINES" = "yes" ; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SPLINES 1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
fi
+if test "$wxUSE_HEADERCTRL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HEADERCTRL 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_HYPERLINKCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_HYPERLINKCTRL 1
_ACEOF
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
fi
if test "$wxUSE_NOTEBOOK" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
+if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_NOTIFICATION_MESSAGE 1
+_ACEOF
+
+fi
+
if test "$wxUSE_ODCOMBOBOX" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ODCOMBOBOX 1
USES_CONTROLS=1
fi
+if test "$wxUSE_REARRANGECTRL" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_REARRANGECTRL 1
+_ACEOF
+
+fi
+
if test "$wxUSE_SASH" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SASH 1
_ACEOF
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
fi
if test "$wxUSE_SEARCHCTRL" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
fi
-if test "$wxUSE_TAB_DIALOG" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_TAB_DIALOG 1
-_ACEOF
-
-fi
-
if test "$wxUSE_TEXTCTRL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_TEXTCTRL 1
USES_CONTROLS=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHEDIT 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHEDIT2 1
+_ACEOF
+
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+ if test "$wxUSE_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Popup window not yet supported under Mac OS X... disabled" >&2;}
else
USE_HTML=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
- if test "$wxUSE_MAC" = 1; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
- fi
fi
if test "$wxUSE_WEBKIT" = "yes"; then
if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
else
wxUSE_WEBKIT=no
fi
+ if test "$wxUSE_WEBKIT" = "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl"
+ fi
fi
USE_XRC=0
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS aui"
fi
+USE_PROPGRID=0
+if test "$wxUSE_PROPGRID" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_PROPGRID 1
+_ACEOF
+
+ USE_PROPGRID=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
+fi
+
USE_STC=0
if test "$wxUSE_STC" = "yes"; then
cat >>confdefs.h <<\_ACEOF
fi
if test "$wxUSE_PROGRESSDLG" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&5
-echo "$as_me: WARNING: wxProgressDialog requires constraints so it won't be compiled without them" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_PROGRESSDLG 1
_ACEOF
- fi
fi
if test "$wxUSE_SPLASH" = "yes"; then
fi
if test "$wxUSE_STARTUP_TIPS" = "yes"; then
- if test "$wxUSE_CONSTRAINTS" != "yes"; then
- { echo "$as_me:$LINENO: WARNING: Startup tips requires constraints and won't be compiled without them" >&5
-echo "$as_me: WARNING: Startup tips requires constraints and won't be compiled without them" >&2;}
- else
- cat >>confdefs.h <<\_ACEOF
+ cat >>confdefs.h <<\_ACEOF
#define wxUSE_STARTUP_TIPS 1
_ACEOF
- fi
fi
if test "$wxUSE_TEXTDLG" = "yes"; then
fi
+if test "$wxUSE_MSW" = 1 -o "$wxUSE_PM" = 1; then
+ if test "$wxUSE_OWNER_DRAWN" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_OWNER_DRAWN 1
+_ACEOF
+
+ fi
+fi
+
+
if test "$wxUSE_MSW" = 1 ; then
if test "$wxUSE_DC_CACHEING" = "yes"; then
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
fi
+if test "$wxUSE_AUTOID_MANAGEMENT" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_AUTOID_MANAGEMENT 1
+_ACEOF
+
+fi
if test "$USE_WIN32" = 1 ; then
if test "$wxUSE_INICONF" = "yes"; then
fi
+if test "$wxUSE_MAC" = 1; then
+ wxUSE_GRAPHICS_CONTEXT="yes"
+fi
+
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_GRAPHICS_CONTEXT 1
_ACEOF
USE_MEDIA=0
-if test "$wxUSE_MEDIACTRL" = "yes"; then
+if test "$wxUSE_MEDIACTRL" = "yes" -o "$wxUSE_MEDIACTRL" = "auto"; then
USE_MEDIA=1
if test "$wxUSE_GTK" = 1; then
if test "$wxUSE_GSTREAMER" = "yes"; then
CPPFLAGS="$GST_CFLAGS $CPPFLAGS"
- LIBS="$GST_LIBS $LIBS"
+ EXTRALIBS_MEDIA="$GST_LIBS"
cat >>confdefs.h <<\_ACEOF
#define wxUSE_GSTREAMER 1
#define wxUSE_MEDIACTRL 1
_ACEOF
+ else
+ if test "$wxUSE_MEDIACTRL" = "yes"; then
+ { { echo "$as_me:$LINENO: error: GStreamer not available" >&5
+echo "$as_me: error: GStreamer not available" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { echo "$as_me:$LINENO: WARNING: GStreamer not available... disabling wxMediaCtrl" >&5
+echo "$as_me: WARNING: GStreamer not available... disabling wxMediaCtrl" >&2;}
+ fi
fi
fi
-if test "$cross_compiling" = "yes"; then
+if test "$cross_compiling" != "no"; then
OSINFO="\"$host\""
else
OSINFO=`uname -s -r -m`
if test "$wxUSE_AUI" = "yes" ; then
BUILT_WX_LIBS="aui $BUILT_WX_LIBS"
fi
+ if test "$wxUSE_PROPGRID" = "yes" ; then
+ BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
+ fi
+ if test "$wxUSE_RICHTEXT" = "yes" ; then
+ BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
+ fi
if test "$wxUSE_STC" = "yes" ; then
BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
fi
if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
if test "$USE_DARWIN" = 1; then
LDFLAGS="$LDFLAGS -framework QuickTime"
- else
- LDFLAGS="$LDFLAGS -lQuickTimeLib"
fi
fi
if test "$USE_DARWIN" = 1; then
- LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
- else
- LDFLAGS="$LDFLAGS -lCarbonLib"
+ LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
fi
fi
if test "$wxUSE_COCOA" = 1 ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
- erase event exec font image minimal mobile \
- mobile/wxedit mobile/styles render \
- shaped svg taborder vscroll widgets"
+ erase event exec font image minimal render \
+ shaped svg taborder vscroll widgets wrapsizer"
if test "$wxUSE_MONOLITHIC" != "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
fi
else
SAMPLES_SUBDIRS="console"
+ if test "$wxUSE_SOCKETS" = "yes" ; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+ fi
+ if test "$wxUSE_IPC" = "yes" ; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
+ fi
fi
if test "x$INTELCC" = "xyes" ; then
- CWARNINGS="-Wall -wd810,869,981,1418,1572,1684"
+ CWARNINGS="-Wall -wd810,869,981,1418,1572,1684,2259"
elif test "$GCC" = yes ; then
CWARNINGS="-Wall -Wundef"
fi
if test "x$INTELCXX" = "xyes" ; then
- CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419"
+ CXXWARNINGS="-Wall -wd279,383,444,810,869,981,1418,1419,1881,2259"
elif test "$GXX" = yes ; then
- CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+ CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy"
+ { echo "$as_me:$LINENO: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5
+echo $ECHO_N "checking CXXWARNINGS for gcc -Woverloaded-virtual... $ECHO_C" >&6; }
+if test "${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown"
+
+ 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
+
+ ac_save_CXXFLAGS="$CXXFLAGS"
+for ac_arg in "-pedantic -Werror % -Woverloaded-virtual" "-pedantic % -Woverloaded-virtual %% no, obsolete" #
+do CXXFLAGS="$ac_save_CXXFLAGS "`echo $ac_arg | sed -e 's,%%.*,,' -e 's,%,,'`
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+return 0;
+ ;
+ 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
+ ac_cv_cxxflags_gcc_option__Woverloaded_virtual=`echo $ac_arg | sed -e 's,.*% *,,'` ; break
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+done
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&5
+echo "${ECHO_T}$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" >&6; }
+case ".$ac_cv_cxxflags_gcc_option__Woverloaded_virtual" in
+ .ok|.ok,*) ;;
+ .|.no|.no,*) ;;
+ *)
+ if echo " $CXXWARNINGS " | grep " $ac_cv_cxxflags_gcc_option__Woverloaded_virtual " 2>&1 >/dev/null
+ then { (echo "$as_me:$LINENO: : CXXWARNINGS does contain \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual") >&5
+ (: CXXWARNINGS does contain $ac_cv_cxxflags_gcc_option__Woverloaded_virtual) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ else { (echo "$as_me:$LINENO: : CXXWARNINGS=\"\$CXXWARNINGS \$ac_cv_cxxflags_gcc_option__Woverloaded_virtual\"") >&5
+ (: CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ CXXWARNINGS="$CXXWARNINGS $ac_cv_cxxflags_gcc_option__Woverloaded_virtual"
+ fi
+ ;;
+esac
+
fi
C_AND_CXX_FLAGS="$DEBUG_CFLAGS $PROFILE_FLAGS $OPTIMISE_CFLAGS"
CFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $CFLAGS `
CXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $CXXFLAGS `
+OBJCFLAGS=`echo $WXCONFIG_CFLAGS $CWARNINGS $C_AND_CXX_FLAGS $OBJCFLAGS `
+OBJCXXFLAGS=`echo $WXCONFIG_CXXFLAGS $C_AND_CXX_FLAGS $OBJCXXFLAGS `
WXCONFIG_CPPFLAGS=`echo $WXCONFIG_CPPFLAGS $WXCONFIG_ONLY_CPPFLAGS`
EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
EXTRALIBS_XML="$EXPAT_LINK"
EXTRALIBS_HTML="$MSPACK_LINK"
+EXTRALIBS_MEDIA="$GST_LIBS"
EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
if test "$wxUSE_GUI" = "yes"; then
EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT`
;;
*)
- for t in `echo $wxUNIV_THEMES | tr , ' ' | tr a-z A-Z`; do
+ for t in `echo $wxUNIV_THEMES | tr , ' ' | tr '[a-z]' '[A-Z]'`; do
cat >>confdefs.h <<_ACEOF
#define wxUSE_THEME_$t 1
_ACEOF
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[A-Z]" "[a-z]"`
+
+
+TOOLKIT_LOWERCASE=xxx
+if test "$TOOLKIT" = "MAC"; then
+ TOOLKIT_LOWERCASE=osx_carbon
+fi
+if test "$TOOLKIT" = "OSX_CARBON"; then
+ TOOLKIT_LOWERCASE=osx_carbon
+fi
+if test "$TOOLKIT" = "OSX_COCOA"; then
+ TOOLKIT_LOWERCASE=osx_cocoa
+fi
+if test "$TOOLKIT_LOWERCASE" = "xxx"; then
+ TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[A-Z]' '[a-z]'`
+fi
+
+
case "$TOOLKIT" in
GTK)
TOOLKIT_DESC="GTK+"
- if test "$WXGTK20" = 1; then
+ if test "$WXGTK2" = 1; then
TOOLKIT_DESC="$TOOLKIT_DESC 2"
if test "$wxUSE_GTKPRINT" = "yes" ; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing";
+
+
+
if test "x$BAKEFILE_HOST" = "x"; then
if test "x${host}" = "x" ; then
{ { echo "$as_me:$LINENO: error: You must call the autoconf \"CANONICAL_HOST\" macro in your configure.ac (or .in) file." >&5
fi
- case ${BAKEFILE_HOST} in
- *-hp-hpux* )
- INSTALL_DIR="mkdir -p"
- ;;
- * )
- INSTALL_DIR='$(INSTALL) -d'
- ;;
- esac
+ { echo "$as_me:$LINENO: checking for command to install directories" >&5
+echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; }
+ INSTALL_TEST_DIR=acbftest$$
+ $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1
+ if test $? = 0 -a -d $INSTALL_TEST_DIR; then
+ rmdir $INSTALL_TEST_DIR
+ INSTALL_DIR='$(INSTALL) -d'
+ { echo "$as_me:$LINENO: result: $INSTALL -d" >&5
+echo "${ECHO_T}$INSTALL -d" >&6; }
+ else
+ INSTALL_DIR="mkdir -p"
+ { echo "$as_me:$LINENO: result: mkdir -p" >&5
+echo "${ECHO_T}mkdir -p" >&6; }
+ fi
LDFLAGS_GUI=
dlldir="$libdir"
case "${BAKEFILE_HOST}" in
+ ia64-hp-hpux* )
+ ;;
*-hp-hpux* )
SO_SUFFIX="sl"
SO_SUFFIX_MODULE="sl"
;;
*-*-linux* )
- if test "$INTELCC" = "yes"; then
+ if test "$INTELCC" = "yes" -a "$INTELCC8" != "yes"; then
PIC_FLAG="-KPIC"
elif test "x$SUNCXX" = "xyes"; then
SHARED_LD_CC="${CC} -G -o"
linking_flag="-dynamiclib"
ldargs="-r -keep_private_externs -nostdlib"
+if test "x${D}CXX" = "x"; then
+ CXX="c++"
+fi
+
while test ${D}# -gt 0; do
case ${D}1 in
shift
;;
+ -arch|-isysroot)
+ # collect these options and values
+ ldargs="${D}{ldargs} ${D}1 ${D}2"
+ shift
+ ;;
+
-s|-Wl,*)
# collect these load args
ldargs="${D}{ldargs} ${D}1"
# Link one module containing all the others
#
if test ${D}{verbose} = 1; then
- echo "c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
+ echo "${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o"
fi
-c++ ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
+${D}CXX ${D}{ldargs} ${D}{objects} -o master.${D}${D}.o
status=${D}?
#
#
if test ${D}{status} = 0; then
if test ${D}{verbose} = 1; then
- echo "c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
+ echo "${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}"
fi
- c++ ${D}{linking_flag} master.${D}${D}.o ${D}{args}
+ ${D}CXX ${D}{linking_flag} master.${D}${D}.o ${D}{args}
status=${D}?
fi
chmod +x shared-ld-sh
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
- SHARED_LD_MODULE_CXX="$SHARED_LD_MODULE_CC"
+ SHARED_LD_MODULE_CXX="CXX=\$(CXX) $SHARED_LD_MODULE_CC"
{ echo "$as_me:$LINENO: checking for gcc 3.1 or later" >&5
SONAME_FLAG=
case "${BAKEFILE_HOST}" in
- *-*-linux* | *-*-freebsd* | *-*-k*bsd*-gnu )
+ *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+ *-*-k*bsd*-gnu | *-*-mirbsd* )
if test "x$SUNCXX" = "xyes"; then
SONAME_FLAG="-h "
else
cat <<EOF >bk-deps
#!/bin/sh
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
# script. It is used to track C/C++ files dependencies in portable way.
#
# Permission is given to use this file in any way.
DEPSMODE=${DEPSMODE}
-DEPSDIR=.deps
DEPSFLAG="${DEPSFLAG}"
-
-mkdir -p ${D}DEPSDIR
+DEPSDIRBASE=.deps
if test ${D}DEPSMODE = gcc ; then
${D}* ${D}{DEPSFLAG}
status=${D}?
- if test ${D}{status} != 0 ; then
- exit ${D}{status}
- fi
- # move created file to the location we want it in:
+
+ # determine location of created files:
while test ${D}# -gt 0; do
case "${D}1" in
-o )
esac
shift
done
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
depfile=\`basename ${D}srcfile | sed -e 's/\\..*${D}/.d/g'\`
depobjname=\`echo ${D}depfile |sed -e 's/\\.d/.o/g'\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ # if the compiler failed, we're done:
+ if test ${D}{status} != 0 ; then
+ rm -f ${D}depfile
+ exit ${D}{status}
+ fi
+
+ # move created file to the location we want it in:
if test -f ${D}depfile ; then
- sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+ sed -e "s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
rm -f ${D}depfile
else
# "g++ -MMD -o fooobj.o foosrc.cpp" produces fooobj.d
- depfile=\`basename ${D}objfile | sed -e 's/\\..*${D}/.d/g'\`
+ depfile=\`echo "${D}objfile" | sed -e 's/\\..*${D}/.d/g'\`
if test ! -f ${D}depfile ; then
# "cxx -MD -o fooobj.o foosrc.cpp" creates fooobj.o.d (Compaq C++)
depfile="${D}objfile.d"
fi
if test -f ${D}depfile ; then
- sed -e "/^${D}objfile/!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{DEPSDIR}/${D}{objfile}.d
+ sed -e "\\,^${D}objfile,!s,${D}depobjname:,${D}objfile:,g" ${D}depfile >${D}{depsdir}/${D}{objfilebase}.d
rm -f ${D}depfile
fi
fi
exit 0
+
elif test ${D}DEPSMODE = mwcc ; then
${D}* || exit ${D}?
# Run mwcc again with -MM and redirect into the dep file we want
fi
prevarg="${D}arg"
done
- ${D}* ${D}DEPSFLAG >${D}{DEPSDIR}/${D}{objfile}.d
+
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ ${D}* ${D}DEPSFLAG >${D}{depsdir}/${D}{objfilebase}.d
exit 0
+
elif test ${D}DEPSMODE = unixcc; then
${D}* || exit ${D}?
# Run compiler again with deps flag and redirect into the dep file.
esac
shift
done
- eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{DEPSDIR}/${D}{objfile}.d
+
+ objfilebase=\`basename ${D}objfile\`
+ builddir=\`dirname ${D}objfile\`
+ depsdir=${D}builddir/${D}DEPSDIRBASE
+ mkdir -p ${D}depsdir
+
+ eval "${D}cmd ${D}DEPSFLAG" | sed "s|.*:|${D}objfile:|" >${D}{depsdir}/${D}{objfilebase}.d
exit 0
+
else
${D}*
exit ${D}?
- BAKEFILE_BAKEFILE_M4_VERSION="0.2.2"
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2"
+
+ BAKEFILE_BAKEFILE_M4_VERSION="0.2.5"
+
+
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.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. */
-
-int
-main ()
-{
-
- #if !defined(__INTEL_COMPILER) || \
- (__INTEL_COMPILER < 800)
- There is no PCH support
- #endif
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-
- { echo "$as_me:$LINENO: result: yes" >&5
+ if test "$INTELCXX8" = "yes"; then
+ { echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- ICC_PCH=1
-
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- { echo "$as_me:$LINENO: result: no" >&5
+ ICC_PCH=1
+ if test "$INTELCXX10" = "yes"; then
+ ICC_PCH_CREATE_SWITCH="-pch-create"
+ ICC_PCH_USE_SWITCH="-pch-use"
+ else
+ ICC_PCH_CREATE_SWITCH="-create-pch"
+ ICC_PCH_USE_SWITCH="-use-pch"
+ fi
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
fi
cat <<EOF >bk-make-pch
#!/bin/sh
-# This script is part of Bakefile (http://bakefile.sourceforge.net) autoconf
+# This script is part of Bakefile (http://www.bakefile.org) autoconf
# script. It is used to generated precompiled headers.
#
# Permission is given to use this file in any way.
shift
shift
+builddir=\`echo ${D}outfile | sed -e 's,/\\.pch/.*${D},,g'\`
+
compiler=""
headerfile=""
headerfile="${D}{incdir}/${D}{header}"
fi
;;
- -use-pch|-use_pch )
+ -use-pch|-use_pch|-pch-use )
shift
add_to_cmdline=0
;;
else
mkdir -p \`dirname ${D}{outfile}\`
fi
- depsfile=".deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
- mkdir -p .deps
+ depsfile="${D}{builddir}/.deps/\`echo ${D}{outfile} | tr '/.' '__'\`.d"
+ mkdir -p ${D}{builddir}/.deps
if test "x${GCC_PCH}" = "x1" ; then
# can do this because gcc is >= 3.4:
${D}{compiler} -o ${D}{outfile} -MMD -MF "${D}{depsfile}" "${D}{headerfile}"
#include "${D}header"
EOT
# using -MF icc complains about differing command lines in creation/use
- ${D}compiler -c -create_pch ${D}outfile -MMD ${D}file && \\
+ ${D}compiler -c ${ICC_PCH_CREATE_SWITCH} ${D}outfile -MMD ${D}file && \\
sed -e "s,^.*:,${D}outfile:," -e "s, ${D}file,," < ${D}dfile > ${D}depsfile && \\
rm -f ${D}file ${D}dfile ${D}{filename}.o
fi
+
+
COND_BUILD_DEBUG="#"
if test "x$BUILD" = "xdebug" ; then
COND_BUILD_DEBUG=""
COND_BUILD_RELEASE_UNICODE_1=""
fi
+ COND_BUILD_debug="#"
+ if test "x$BUILD" = "xdebug" ; then
+ COND_BUILD_debug=""
+ fi
+
+ COND_BUILD_debug_DEBUG_FLAG_default="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
+ COND_BUILD_debug_DEBUG_FLAG_default=""
+ fi
+
+ COND_BUILD_debug_DEBUG_INFO_default="#"
+ if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_debug_DEBUG_INFO_default=""
+ fi
+
+ COND_BUILD_debug_UNICODE_0="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_debug_UNICODE_0=""
+ fi
+
+ COND_BUILD_debug_UNICODE_1="#"
+ if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_debug_UNICODE_1=""
+ fi
+
+ COND_BUILD_release="#"
+ if test "x$BUILD" = "xrelease" ; then
+ COND_BUILD_release=""
+ fi
+
+ COND_BUILD_release_DEBUG_INFO_default="#"
+ if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
+ COND_BUILD_release_DEBUG_INFO_default=""
+ fi
+
+ COND_BUILD_release_UNICODE_0="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
+ COND_BUILD_release_UNICODE_0=""
+ fi
+
+ COND_BUILD_release_UNICODE_1="#"
+ if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
+ COND_BUILD_release_UNICODE_1=""
+ fi
+
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1=""
fi
+ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1=""
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1=""
fi
+ COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1=""
+ fi
+
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1=""
COND_MONOLITHIC_0_USE_MEDIA_1=""
fi
+ COND_MONOLITHIC_0_USE_PROPGRID_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$USE_PROPGRID" = "x1" ; then
+ COND_MONOLITHIC_0_USE_PROPGRID_1=""
+ fi
+
COND_MONOLITHIC_0_USE_QA_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_QA" = "x1" ; then
COND_MONOLITHIC_0_USE_QA_1=""
COND_PLATFORM_MACOSX_1=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "x" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_=""
+ COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_MSDOS" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xCOCOA" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_GTK="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_GTK=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1=""
fi
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1=""
- fi
-
- COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xMOTIF" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF=""
- fi
-
- COND_PLATFORM_MACOSX_1_TOOLKIT_X11="#"
- if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xX11" ; then
- COND_PLATFORM_MACOSX_1_TOOLKIT_X11=""
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
fi
+ COND_PLATFORM_MACOSX_1_USE_OPENGL_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_OPENGL" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_USE_OPENGL_1=""
+ fi
+
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_SOVERSION" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
COND_PLATFORM_MACOS_1=""
fi
+ COND_PLATFORM_MAC_0="#"
+ if test "x$PLATFORM_MAC" = "x0" ; then
+ COND_PLATFORM_MAC_0=""
+ fi
+
+ COND_PLATFORM_MAC_1="#"
+ if test "x$PLATFORM_MAC" = "x1" ; then
+ COND_PLATFORM_MAC_1=""
+ fi
+
+ COND_PLATFORM_MSDOS_0="#"
+ if test "x$PLATFORM_MSDOS" = "x0" ; then
+ COND_PLATFORM_MSDOS_0=""
+ fi
+
COND_PLATFORM_MSDOS_1="#"
if test "x$PLATFORM_MSDOS" = "x1" ; then
COND_PLATFORM_MSDOS_1=""
COND_SHARED_0=""
fi
+ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0="#"
+ if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMAC" -a "x$WXUNIV" = "x0" ; then
+ COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0=""
+ fi
+
+ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0="#"
+ if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xMSW" -a "x$WXUNIV" = "x0" ; then
+ COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0=""
+ fi
+
+ COND_SHARED_0_TOOLKIT_PM_WXUNIV_0="#"
+ if test "x$SHARED" = "x0" -a "x$TOOLKIT" = "xPM" -a "x$WXUNIV" = "x0" ; then
+ COND_SHARED_0_TOOLKIT_PM_WXUNIV_0=""
+ fi
+
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_OPENGL" = "x1" ; then
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1=""
fi
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
fi
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin=""
fi
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
if test "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
- COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
+ COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
fi
COND_SHARED_0_USE_STC_1="#"
COND_SHARED_0_USE_STC_1=""
fi
- COND_SHARED_0_WXUSE_EXPAT_BUILTIN="#"
+ COND_SHARED_0_wxUSE_EXPAT_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_EXPAT" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_EXPAT_BUILTIN=""
+ COND_SHARED_0_wxUSE_EXPAT_builtin=""
fi
- COND_SHARED_0_WXUSE_REGEX_BUILTIN="#"
+ COND_SHARED_0_wxUSE_REGEX_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_REGEX" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_REGEX_BUILTIN=""
+ COND_SHARED_0_wxUSE_REGEX_builtin=""
fi
- COND_SHARED_0_WXUSE_ZLIB_BUILTIN="#"
+ COND_SHARED_0_wxUSE_ZLIB_builtin="#"
if test "x$SHARED" = "x0" -a "x$wxUSE_ZLIB" = "xbuiltin" ; then
- COND_SHARED_0_WXUSE_ZLIB_BUILTIN=""
+ COND_SHARED_0_wxUSE_ZLIB_builtin=""
fi
COND_SHARED_1="#"
COND_TOOLKIT_MAC=""
fi
- COND_TOOLKIT_MAC_USE_GUI_1="#"
- if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" ; then
- COND_TOOLKIT_MAC_USE_GUI_1=""
- fi
-
- COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0="#"
- if test "x$TOOLKIT" = "xMAC" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
- COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0=""
- fi
-
COND_TOOLKIT_MGL="#"
if test "x$TOOLKIT" = "xMGL" ; then
COND_TOOLKIT_MGL=""
COND_TOOLKIT_MSW_WXUNIV_0=""
fi
+ COND_TOOLKIT_OSX_CARBON="#"
+ if test "x$TOOLKIT" = "xOSX_CARBON" ; then
+ COND_TOOLKIT_OSX_CARBON=""
+ fi
+
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1=""
+ fi
+
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0="#"
+ if test "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0=""
+ fi
+
+ COND_TOOLKIT_OSX_COCOA="#"
+ if test "x$TOOLKIT" = "xOSX_COCOA" ; then
+ COND_TOOLKIT_OSX_COCOA=""
+ fi
+
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1=""
+ fi
+
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0="#"
+ if test "x$TOOLKIT" = "xOSX_COCOA" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
+ fi
+
+ COND_TOOLKIT_OSX_IPHONE="#"
+ if test "x$TOOLKIT" = "xOSX_IPHONE" ; then
+ COND_TOOLKIT_OSX_IPHONE=""
+ fi
+
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then
COND_TOOLKIT_PM=""
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
fi
+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
+ fi
+
+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBPNG_builtin=""
+ fi
+
+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin="#"
+ if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_USE_GUI_1_wxUSE_LIBTIFF_builtin=""
+ fi
+
+ COND_USE_OPENGL_1="#"
+ if test "x$USE_OPENGL" = "x1" ; then
+ COND_USE_OPENGL_1=""
+ fi
+
COND_USE_PCH_1="#"
if test "x$USE_PCH" = "x1" ; then
COND_USE_PCH_1=""
COND_WXUSE_ZLIB_BUILTIN=""
fi
+ COND_wxUSE_EXPAT_builtin="#"
+ if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
+ COND_wxUSE_EXPAT_builtin=""
+ fi
+
+ COND_wxUSE_LIBJPEG_builtin="#"
+ if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
+ COND_wxUSE_LIBJPEG_builtin=""
+ fi
+
+ COND_wxUSE_LIBPNG_builtin="#"
+ if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
+ COND_wxUSE_LIBPNG_builtin=""
+ fi
+
+ COND_wxUSE_LIBTIFF_builtin="#"
+ if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
+ COND_wxUSE_LIBTIFF_builtin=""
+ fi
+
+ COND_wxUSE_REGEX_builtin="#"
+ if test "x$wxUSE_REGEX" = "xbuiltin" ; then
+ COND_wxUSE_REGEX_builtin=""
+ fi
+
+ COND_wxUSE_ZLIB_builtin="#"
+ if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
+ COND_wxUSE_ZLIB_builtin=""
+ fi
+
if test "$BAKEFILE_AUTOCONF_INC_M4_VERSION" = "" ; then
MACSETFILE="\$(SETFILE)"
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_OSX_CARBON" = 1; then
POSTLINK_COMMAND="\$(REZ) -d __DARWIN__ -t APPL Carbon.r -o"
RESCOMP="$REZ"
WXCONFIG_RESFLAGS="-d __DARWIN__ -t APPL Carbon.r -o"
echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13361" >&2;}
fi
- CPPFLAGS="-DWX_PRECOMP $CPPFLAGS"
+ # Our WX_PRECOMP flag does not make sense for any language except C++ because
+ # the headers that benefit from precompilation are mostly C++ headers.
+ CXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
+ # When Bakefile can do multi-language PCH (e.g. C++ and Objective-C++) enable this:
+ #OBJCXXFLAGS="-DWX_PRECOMP $CXXFLAGS"
fi
CFLAGS="$CFLAGS $CFLAGS_VISIBILITY"
CXXFLAGS="$CXXFLAGS $CXXFLAGS_VISIBILITY"
+OBJCFLAGS="$OBJCFLAGS $CFLAGS_VISIBILITY"
+OBJCXXFLAGS="$OBJCXXFLAGS $CXXFLAGS_VISIBILITY"
SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
ac_config_files="$ac_config_files lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in"
+ac_config_files="$ac_config_files utils/ifacecheck/rungccxml.sh"
+
+
if test "$wx_cv_version_script" = "yes"; then
ac_config_files="$ac_config_files version-script"
if test "$wxWITH_SUBDIRS" != "no"; then
if test "$wxUSE_GUI" = "yes"; then
SUBDIRS="samples demos utils"
-else SUBDIRS="samples utils"
+else
+ SUBDIRS="samples utils"
fi
-for subdir in `echo $SUBDIRS`; do
+for subdir in $SUBDIRS; do
if test -d ${srcdir}/${subdir} ; then
if test "$wxUSE_GUI" = "yes"; then
if test ${subdir} = "samples"; then
makefiles="samples/Makefile.in $makefiles"
- for sample in `echo $SAMPLES_SUBDIRS`; do
+ for sample in $SAMPLES_SUBDIRS; do
if test -d $srcdir/samples/$sample; then
makefiles="samples/$sample/Makefile.in $makefiles"
fi
done
else
- disabled_var=DISABLED_`echo $subdir | tr [a-z] [A-Z]`;
+ disabled_var=DISABLED_`echo $subdir | tr '[a-z]' '[A-Z]'`
eval "disabled=\$$disabled_var"
disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | $EGREP -v "$disabled"`
fi
- else if test ${subdir} = "samples"; then
- makefiles="samples/Makefile.in samples/console/Makefile.in"
+ else
+ if test ${subdir} = "samples"; then
+ makefiles="samples/Makefile.in $makefiles"
+ for sample in `echo $SAMPLES_SUBDIRS`; do
+ if test -d $srcdir/samples/$sample; then
+ makefiles="samples/$sample/Makefile.in $makefiles"
+ fi
+ done
elif test ${subdir} = "utils"; then
makefiles=""
- for util in HelpGen tex2rtf ; do
+ for util in ifacecheck ; do
if test -d $srcdir/utils/$util ; then
- makefiles="utils/$util/Makefile.in \
- utils/$util/src/Makefile.in \
+ makefiles="utils/$util/src/Makefile.in \
$makefiles"
fi
done
- else makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+ else
+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
fi
fi
"rcdefs.h") CONFIG_COMMANDS="$CONFIG_COMMANDS rcdefs.h" ;;
"lib/wx/config/${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in" ;;
"lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}") CONFIG_FILES="$CONFIG_FILES lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in" ;;
+ "utils/ifacecheck/rungccxml.sh") CONFIG_FILES="$CONFIG_FILES utils/ifacecheck/rungccxml.sh" ;;
"version-script") CONFIG_FILES="$CONFIG_FILES version-script" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;;
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
-target!$target$ac_delim
-target_cpu!$target_cpu$ac_delim
-target_vendor!$target_vendor$ac_delim
-target_os!$target_os$ac_delim
wx_top_builddir!$wx_top_builddir$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
CFLAGS_VISIBILITY!$CFLAGS_VISIBILITY$ac_delim
CXXFLAGS_VISIBILITY!$CXXFLAGS_VISIBILITY$ac_delim
LIBICONV!$LIBICONV$ac_delim
+GXX_VERSION!$GXX_VERSION$ac_delim
SDL_CONFIG!$SDL_CONFIG$ac_delim
SDL_CFLAGS!$SDL_CFLAGS$ac_delim
SDL_LIBS!$SDL_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
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-CAIRO_LIBS!$CAIRO_LIBS$ac_delim
-GST_CFLAGS!$GST_CFLAGS$ac_delim
-GST_LIBS!$GST_LIBS$ac_delim
ALL_WX_LIBS!$ALL_WX_LIBS$ac_delim
BUILT_WX_LIBS!$BUILT_WX_LIBS$ac_delim
STD_BASE_LIBS!$STD_BASE_LIBS$ac_delim
EXTRALIBS!$EXTRALIBS$ac_delim
EXTRALIBS_XML!$EXTRALIBS_XML$ac_delim
EXTRALIBS_HTML!$EXTRALIBS_HTML$ac_delim
+EXTRALIBS_MEDIA!$EXTRALIBS_MEDIA$ac_delim
EXTRALIBS_GUI!$EXTRALIBS_GUI$ac_delim
EXTRALIBS_OPENGL!$EXTRALIBS_OPENGL$ac_delim
EXTRALIBS_SDL!$EXTRALIBS_SDL$ac_delim
+EXTRALIBS_STC!$EXTRALIBS_STC$ac_delim
WITH_PLUGIN_SDL!$WITH_PLUGIN_SDL$ac_delim
EXTRALIBS_GTKPRINT!$EXTRALIBS_GTKPRINT$ac_delim
EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$ac_delim
DEBUG_FLAG!$DEBUG_FLAG$ac_delim
TOOLKIT_LOWERCASE!$TOOLKIT_LOWERCASE$ac_delim
TOOLKIT_VERSION!$TOOLKIT_VERSION$ac_delim
+DYLIB_RPATH_INSTALL!$DYLIB_RPATH_INSTALL$ac_delim
+DYLIB_RPATH_POSTLINK!$DYLIB_RPATH_POSTLINK$ac_delim
SAMPLES_RPATH_FLAG!$SAMPLES_RPATH_FLAG$ac_delim
-SAMPLES_RPATH_POSTLINK!$SAMPLES_RPATH_POSTLINK$ac_delim
+HEADER_PAD_OPTION!$HEADER_PAD_OPTION$ac_delim
HOST_SUFFIX!$HOST_SUFFIX$ac_delim
CPPUNIT_CFLAGS!$CPPUNIT_CFLAGS$ac_delim
CPPUNIT_LIBS!$CPPUNIT_LIBS$ac_delim
WINDRES!$WINDRES$ac_delim
REZ!$REZ$ac_delim
SETFILE!$SETFILE$ac_delim
+OBJCXXFLAGS!$OBJCXXFLAGS$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
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
+ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
+ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+BK_MAKE_PCH!$BK_MAKE_PCH$ac_delim
+COND_BUILD_DEBUG!$COND_BUILD_DEBUG$ac_delim
+COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT!$COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT$ac_delim
+COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT!$COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT$ac_delim
COND_BUILD_DEBUG_UNICODE_0!$COND_BUILD_DEBUG_UNICODE_0$ac_delim
COND_BUILD_DEBUG_UNICODE_1!$COND_BUILD_DEBUG_UNICODE_1$ac_delim
COND_BUILD_RELEASE!$COND_BUILD_RELEASE$ac_delim
COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT!$COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT$ac_delim
COND_BUILD_RELEASE_UNICODE_0!$COND_BUILD_RELEASE_UNICODE_0$ac_delim
COND_BUILD_RELEASE_UNICODE_1!$COND_BUILD_RELEASE_UNICODE_1$ac_delim
+COND_BUILD_debug!$COND_BUILD_debug$ac_delim
+COND_BUILD_debug_DEBUG_FLAG_default!$COND_BUILD_debug_DEBUG_FLAG_default$ac_delim
+COND_BUILD_debug_DEBUG_INFO_default!$COND_BUILD_debug_DEBUG_INFO_default$ac_delim
+COND_BUILD_debug_UNICODE_0!$COND_BUILD_debug_UNICODE_0$ac_delim
+COND_BUILD_debug_UNICODE_1!$COND_BUILD_debug_UNICODE_1$ac_delim
+COND_BUILD_release!$COND_BUILD_release$ac_delim
+COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim
+COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim
+COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim
COND_DEBUG_FLAG_1!$COND_DEBUG_FLAG_1$ac_delim
COND_DEBUG_INFO_0!$COND_DEBUG_INFO_0$ac_delim
COND_DEBUG_INFO_1!$COND_DEBUG_INFO_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_STC_1!$COND_MONOLITHIC_0_SHARED_0_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_0_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_0_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim
+COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1!$COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1!$COND_MONOLITHIC_0_SHARED_1_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_STC_1!$COND_MONOLITHIC_0_SHARED_1_USE_STC_1$ac_delim
COND_MONOLITHIC_0_SHARED_1_USE_XRC_1!$COND_MONOLITHIC_0_SHARED_1_USE_XRC_1$ac_delim
COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_GUI_1_USE_MEDIA_1$ac_delim
COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim
COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim
+COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim
COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim
COND_MONOLITHIC_0_USE_RICHTEXT_1!$COND_MONOLITHIC_0_USE_RICHTEXT_1$ac_delim
COND_MONOLITHIC_0_USE_STC_1!$COND_MONOLITHIC_0_USE_STC_1$ac_delim
COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_0_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_!$COND_PLATFORM_MACOSX_1_TOOLKIT_$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA!$COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_GTK!$COND_PLATFORM_MACOSX_1_TOOLKIT_GTK$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF!$COND_PLATFORM_MACOSX_1_TOOLKIT_MOTIF$ac_delim
-COND_PLATFORM_MACOSX_1_TOOLKIT_X11!$COND_PLATFORM_MACOSX_1_TOOLKIT_X11$ac_delim
+COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
COND_PLATFORM_MACOSX_1_USE_GUI_1!$COND_PLATFORM_MACOSX_1_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_USE_OPENGL_1!$COND_PLATFORM_MACOSX_1_USE_OPENGL_1$ac_delim
COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim
COND_PLATFORM_MACOS_1!$COND_PLATFORM_MACOS_1$ac_delim
+COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim
+COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim
+COND_PLATFORM_MSDOS_0!$COND_PLATFORM_MSDOS_0$ac_delim
COND_PLATFORM_MSDOS_1!$COND_PLATFORM_MSDOS_1$ac_delim
COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim
COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim
COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
COND_SHARED_0!$COND_SHARED_0$ac_delim
+COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
+COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
+COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
-COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
COND_SHARED_0_USE_STC_1!$COND_SHARED_0_USE_STC_1$ac_delim
-COND_SHARED_0_WXUSE_EXPAT_BUILTIN!$COND_SHARED_0_WXUSE_EXPAT_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_REGEX_BUILTIN!$COND_SHARED_0_WXUSE_REGEX_BUILTIN$ac_delim
-COND_SHARED_0_WXUSE_ZLIB_BUILTIN!$COND_SHARED_0_WXUSE_ZLIB_BUILTIN$ac_delim
-COND_SHARED_1!$COND_SHARED_1$ac_delim
-COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
-COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
-COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
-COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
-COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
-COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1!$COND_TOOLKIT_MAC_USE_GUI_1$ac_delim
-COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0$ac_delim
+COND_SHARED_0_wxUSE_EXPAT_builtin!$COND_SHARED_0_wxUSE_EXPAT_builtin$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+COND_SHARED_0_wxUSE_REGEX_builtin!$COND_SHARED_0_wxUSE_REGEX_builtin$ac_delim
+COND_SHARED_0_wxUSE_ZLIB_builtin!$COND_SHARED_0_wxUSE_ZLIB_builtin$ac_delim
+COND_SHARED_1!$COND_SHARED_1$ac_delim
+COND_SHARED_1_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_1_USE_GUI_1_USE_OPENGL_1$ac_delim
+COND_TOOLKIT_!$COND_TOOLKIT_$ac_delim
+COND_TOOLKIT_COCOA!$COND_TOOLKIT_COCOA$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1!$COND_TOOLKIT_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_DFB!$COND_TOOLKIT_DFB$ac_delim
+COND_TOOLKIT_DFB_USE_GUI_1!$COND_TOOLKIT_DFB_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK!$COND_TOOLKIT_GTK$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1$ac_delim
+COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_GTK_TOOLKIT_VERSION__USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_GTK_USE_GUI_1!$COND_TOOLKIT_GTK_USE_GUI_1$ac_delim
+COND_TOOLKIT_MAC!$COND_TOOLKIT_MAC$ac_delim
COND_TOOLKIT_MGL!$COND_TOOLKIT_MGL$ac_delim
COND_TOOLKIT_MGL_USE_GUI_1!$COND_TOOLKIT_MGL_USE_GUI_1$ac_delim
COND_TOOLKIT_MOTIF!$COND_TOOLKIT_MOTIF$ac_delim
COND_TOOLKIT_MSW_USE_GUI_1!$COND_TOOLKIT_MSW_USE_GUI_1$ac_delim
COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0$ac_delim
COND_TOOLKIT_MSW_WXUNIV_0!$COND_TOOLKIT_MSW_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_CARBON!$COND_TOOLKIT_OSX_CARBON$ac_delim
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_COCOA!$COND_TOOLKIT_OSX_COCOA$ac_delim
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0$ac_delim
+COND_TOOLKIT_OSX_IPHONE!$COND_TOOLKIT_OSX_IPHONE$ac_delim
COND_TOOLKIT_PM!$COND_TOOLKIT_PM$ac_delim
COND_TOOLKIT_PM_USE_GUI_1!$COND_TOOLKIT_PM_USE_GUI_1$ac_delim
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0$ac_delim
COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN$ac_delim
COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN!$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN$ac_delim
+COND_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
+COND_USE_GUI_1_wxUSE_LIBTIFF_builtin!$COND_USE_GUI_1_wxUSE_LIBTIFF_builtin$ac_delim
+COND_USE_OPENGL_1!$COND_USE_OPENGL_1$ac_delim
COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
COND_WXUSE_LIBTIFF_BUILTIN!$COND_WXUSE_LIBTIFF_BUILTIN$ac_delim
COND_WXUSE_REGEX_BUILTIN!$COND_WXUSE_REGEX_BUILTIN$ac_delim
COND_WXUSE_ZLIB_BUILTIN!$COND_WXUSE_ZLIB_BUILTIN$ac_delim
+COND_wxUSE_EXPAT_builtin!$COND_wxUSE_EXPAT_builtin$ac_delim
+COND_wxUSE_LIBJPEG_builtin!$COND_wxUSE_LIBJPEG_builtin$ac_delim
+COND_wxUSE_LIBPNG_builtin!$COND_wxUSE_LIBPNG_builtin$ac_delim
+COND_wxUSE_LIBTIFF_builtin!$COND_wxUSE_LIBTIFF_builtin$ac_delim
+COND_wxUSE_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
WIN32INSTALL!$WIN32INSTALL$ac_delim
TOOLKIT!$TOOLKIT$ac_delim
TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
+_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+done
+
+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+if test -n "$ac_eof"; then
+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+ ac_eof=`expr $ac_eof + 1`
+fi
+
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
+:n
+t n
+s/'"$ac_delim"'$/,g/; t
+s/$/\\/; p
+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+' >>$CONFIG_STATUS <conf$$subs.sed
+rm -f conf$$subs.sed
+cat >>$CONFIG_STATUS <<_ACEOF
+CEOF$ac_eof
+_ACEOF
+
+
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
cross_compiling!$cross_compiling$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
fi
cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-4.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+cat >"\$tmp/subs-5.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
_ACEOF
sed '
s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
' >>$CONFIG_STATUS <conf$$subs.sed
rm -f conf$$subs.sed
cat >>$CONFIG_STATUS <<_ACEOF
+:end
+s/|#_!!_#|//g
CEOF$ac_eof
_ACEOF
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed 's/|#_!!_#|//g' >$tmp/out
+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" | sed -f "$tmp/subs-5.sed" >$tmp/out
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
;;
"lib/wx/config/${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ;;
"lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}":F) chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ;;
+ "utils/ifacecheck/rungccxml.sh":F) chmod +x utils/ifacecheck/rungccxml.sh ;;
"wx-config":C) rm -f wx-config
${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config
;;
projects / wxWidgets.git / blobdiff