#! /bin/sh
-# From configure.in Id: configure.in 58069 2009-01-13 12:01:30Z FM .
+# From configure.in Id.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0.
+# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2.
#
# Report bugs to <wx-dev@lists.wxwidgets.org>.
#
# Identity of this package.
PACKAGE_NAME='wxWidgets'
PACKAGE_TARNAME='wxwidgets'
-PACKAGE_VERSION='2.9.0'
-PACKAGE_STRING='wxWidgets 2.9.0'
+PACKAGE_VERSION='2.9.2'
+PACKAGE_STRING='wxWidgets 2.9.2'
PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org'
ac_unique_file="wx-config.in"
CXXFLAGS
ac_ct_CXX
AR
+OSX_SW_VERS
+CXXCPP
subdirs
PKG_CONFIG
GTK_CFLAGS
GNOMEVFS_LIBS
HILDON_CFLAGS
HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
+PYTHON
+COND_PYTHON
CAIRO_CFLAGS
CAIRO_LIBS
GST_CFLAGS
EXTRALIBS_GNOMEVFS
EXTRALIBS_HILDON
UNICODE
-BUILD
DEBUG_INFO
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
USE_SOVERSOLARIS
USE_SOVERCYGWIN
USE_MACVERSION
-USE_SOSYMLINKS
+USE_SOTWOSYMLINKS
SONAME_FLAG
DEPS_TRACKING
BK_DEPS
COND_BUILD_release_DEBUG_INFO_default
COND_BUILD_release_UNICODE_0
COND_BUILD_release_UNICODE_1
+COND_DEBUG_FLAG_0
COND_DEBUG_FLAG_1
COND_DEBUG_INFO_0
COND_DEBUG_INFO_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_RIBBON_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_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_RIBBON_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_MEDIA_1
COND_MONOLITHIC_0_USE_PROPGRID_1
COND_MONOLITHIC_0_USE_QA_1
+COND_MONOLITHIC_0_USE_RIBBON_1
COND_MONOLITHIC_0_USE_RICHTEXT_1
COND_MONOLITHIC_0_USE_STC_1
COND_MONOLITHIC_0_USE_XRC_1
COND_PLATFORM_MACOSX_0_USE_SOVERSION_1
COND_PLATFORM_MACOSX_1
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0
+COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_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_TOOLKIT_OSX_IPHONE_USE_GUI_1
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_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_UNIX_1_USE_PLUGINS_0
COND_PLATFORM_WIN32_0
COND_PLATFORM_WIN32_1
+COND_PLATFORM_WIN32_1_SHARED_0
COND_SHARED_0
COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
COND_SHARED_0_TOOLKIT_MSW_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_OSX_IPHONE_USE_GUI_1
+COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_PM
COND_TOOLKIT_PM_USE_GUI_1
COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0
COND_TOOLKIT_X11
COND_TOOLKIT_X11_USE_GUI_1
COND_UNICODE_1
+COND_USE_CAIRO_1
COND_USE_EXCEPTIONS_0
COND_USE_EXCEPTIONS_1
COND_USE_GUI_0
COND_USE_PLUGINS_0
COND_USE_RTTI_0
COND_USE_RTTI_1
-COND_USE_SOSYMLINKS_1
+COND_USE_SOTWOSYMLINKS_1
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1
COND_USE_SOVERLINUX_1
COND_USE_SOVERSION_0
+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1
COND_USE_SOVERSOLARIS_1
COND_USE_STC_1
COND_USE_THREADS_0
WX_VERSION
WX_SUBVERSION
WX_CHARTYPE
-WX_DEBUGTYPE
WXCONFIG_CPPFLAGS
WXCONFIG_CFLAGS
WXCONFIG_CXXFLAGS
WXCONFIG_LIBS
WXCONFIG_RPATH
+WXCONFIG_LDFLAGS
WXCONFIG_LDFLAGS_GUI
WXCONFIG_RESFLAGS
GUIDIST
CXX
CXXFLAGS
CCC
+CXXCPP
PKG_CONFIG
DIRECTFB_CFLAGS
DIRECTFB_LIBS
GNOMEVFS_LIBS
HILDON_CFLAGS
HILDON_LIBS
+HILDON2_CFLAGS
+HILDON2_LIBS
CAIRO_CFLAGS
CAIRO_LIBS
GST_CFLAGS
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wxWidgets 2.9.0 to adapt to many kinds of systems.
+\`configure' configures wxWidgets 2.9.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wxWidgets 2.9.0:";;
+ short | recursive ) echo "Configuration of wxWidgets 2.9.2:";;
esac
cat <<\_ACEOF
--enable-nanox use NanoX
--disable-gtk2 use GTK+ 1.2 instead of 2.0
--enable-gpe use GNOME PDA Environment features if possible
+ --enable-debug build library for debugging
+ --disable-debug_flag disable all debugging support
+ --enable-debug_info generate debug information
+ --enable-debug_gdb create code with extra GDB debugging information
+ --enable-debug_cntxt obsolete, don't use: use wxDebugContext
+ --enable-mem_tracing obsolete, don't use: create code with memory tracing
--disable-shared create static library instead of shared
- --enable-debug same as debug_flag and debug_info
- --enable-stl use STL for containers
+ --enable-stl use standard C++ classes for everything
+ --enable-std_containers use standard C++ container classes
--enable-std_iostreams use standard C++ stream classes
--enable-std_string use standard C++ string classes
+ --enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString
--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-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-profile create code with profiling information
--enable-no_rtti create code without RTTI information
--enable-no_exceptions create code without C++ exceptions handling
--enable-permissive compile code disregarding strict ANSI
--enable-no_deps create code without dependency information
--disable-vararg_macros don't use vararg macros, even if they are supported
- --enable-universal_binary create Mac PowerPC and Intel Universal binary
+ --enable-universal_binary create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures
+ --enable-macosx_arch=ARCH build for just the specified architecture
--enable-compat26 enable wxWidgets 2.6 compatibility
--disable-compat28 disable wxWidgets 2.8 compatibility
--disable-rpath disable use of rpath for uninstalled builds
--enable-objc_uniquifying enable Objective-C class name uniquifying
--disable-visibility disable use of ELF symbols visibility even if supported
+ --disable-tls disable use of compiler TLS support
--enable-intl use internationalization system
--enable-xlocale use x-locale support (requires wxLocale)
--enable-config use wxConfig (and derived) classes
--enable-baseevtloop use event loop in console programs too
--enable-epollloop use wxEpollDispatcher class (Linux only)
--enable-selectloop use wxSelectDispatcher class
+ --enable-any use wxAny class
--enable-apple_ieee use the Apple IEEE codec
--enable-arcstream use wxArchive streams
--enable-base64 use base64 encoding/decoding functions
--enable-exceptions build exception-safe library
--enable-ffile use wxFFile class
--enable-file use wxFile class
+ --enable-filehistory use wxFileHistory class
--enable-filesystem use virtual file systems classes
--enable-fontenum use wxFontEnumerator class
--enable-fontmap use font encodings conversion classes
--enable-fs_archive use virtual archive filesystems
--enable-fs_inet use virtual HTTP/FTP filesystems
--enable-fs_zip now replaced by fs_archive
+ --enable-fswatcher use wxFileSystemWatcher class
--enable-geometry use geometry class
--enable-log use logging system
--enable-longlong use wxLongLong class
--enable-xrc use XRC resources sub-library
--enable-aui use AUI docking library
--enable-propgrid use wxPropertyGrid library
+ --enable-ribbon use wxRibbon library
--enable-stc use wxStyledTextCtrl library
--enable-constraints use layout-constraints system
--enable-loggui use standard GUI logger
--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-graphics_ctx use graphics context 2D drawing API
--enable-clipboard use wxClipboard class
--enable-dnd use Drag'n'Drop classes
--enable-metafile use win32 metafiles
--disable-controls disable compilation of all standard controls
+ --enable-markup support wxControl::SetLabelMarkup
--enable-accel use accelerators
--enable-animatectrl use wxAnimationCtrl class
+ --enable-artstd use standard XPM icons in wxArtProvider
+ --enable-arttango use Tango icons in wxArtProvider
--enable-bmpbutton use wxBitmapButton class
--enable-bmpcombobox use wxBitmapComboBox class
--enable-button use wxButton class
--enable-colourpicker use wxColourPickerCtrl class
--enable-combobox use wxComboBox class
--enable-comboctrl use wxComboCtrl class
+ --enable-commandlinkbutton use wxCommmandLinkButton class
--enable-dataviewctrl use wxDataViewCtrl class
--enable-datepick use wxDatePickerCtrl class
--enable-detect_sm use code to detect X11 session manager
--enable-headerctrl use wxHeaderCtrl class
--enable-hyperlink use wxHyperlinkCtrl class
--enable-imaglist use wxImageList class
+ --enable-infobar use wxInfoBar class
--enable-listbook use wxListbook class
--enable-listbox use wxListBox class
--enable-listctrl use wxListCtrl class
--enable-popupwin use wxPopUpWindow class
--enable-radiobox use wxRadioBox class
--enable-radiobtn use wxRadioButton class
+ --enable-richmsgdlg use wxRichMessageDialog class
--enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog
--enable-sash use wxSashWindow class
--enable-scrollbar use wxScrollBar class and scrollable windows
--enable-metafiles use wxMetaFile (Win32 only)
--enable-dragimage use wxDragImage
--enable-accessibility enable accessibility support
+ --enable-uiactionsim use wxUIActionSimulator (experimental)
--enable-palette use wxPalette class
--enable-image use wxImage class
--enable-gif use gif images (GIF file format)
--with-motif use Motif/Lesstif
--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-osx_iphone use iPhone OS X port
+ --with-osx use Mac OS X (default port, currently Carbon)
+ --with-carbon same as --with-osx_carbon
+ --with-cocoa same as --with-osx_cocoa
+ --with-iphone same as --with-osx_iphone
+ --with-mac same as --with-osx
+ --with-old_cocoa use old, deprecated, Cocoa port
--with-wine use Wine
--with-msw use MS-Windows
--with-pm use OS/2 Presentation Manager
--without-gtkprint don't use GTK printing support
--without-gnomeprint don't use GNOME printing libraries
--with-gnomevfs use GNOME VFS for associating MIME types
- --with-hildon use Hildon framework for Nokia 770
+ --with-hildon use Hildon framework for Nokia 770/800/810
--with-opengl use OpenGL (or Mesa)
--with-dmalloc use dmalloc library (http://dmalloc.com/)
--with-sdl use SDL for audio on Unix
CPP C preprocessor
CXX C++ compiler command
CXXFLAGS C++ compiler flags
+ CXXCPP C++ preprocessor
PKG_CONFIG path to pkg-config utility
DIRECTFB_CFLAGS
C compiler flags for DIRECTFB, overriding pkg-config
HILDON_CFLAGS
C compiler flags for HILDON, overriding pkg-config
HILDON_LIBS linker flags for HILDON, overriding pkg-config
+ HILDON2_CFLAGS
+ C compiler flags for HILDON2, overriding pkg-config
+ HILDON2_LIBS
+ linker flags for HILDON2, overriding pkg-config
CAIRO_CFLAGS
C compiler flags for CAIRO, overriding pkg-config
CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wxWidgets configure 2.9.0
+wxWidgets configure 2.9.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wxWidgets $as_me 2.9.0, which was
+It was created by wxWidgets $as_me 2.9.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
+if test "$cross_compiling" != "no"; then
+ HOST_PREFIX="${host_alias}-"
+ HOST_SUFFIX="-$host_alias"
+else
+ HOST_PREFIX=
+ HOST_SUFFIX=
+fi
wx_major_version_number=2
wx_minor_version_number=9
-wx_release_number=0
+wx_release_number=2
wx_subrelease_number=0
WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
NEEDS_D_REENTRANT_FOR_R_FUNCS=0
-ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA MGL MICROWIN MOTIF MSW PM X11 DFB"
+ALL_TOOLKITS="COCOA GTK OSX_CARBON OSX_COCOA OSX_IPHONE MGL MICROWIN MOTIF MSW PM X11 DFB"
-DEFAULT_wxUSE_COCOA=0
+DEFAULT_wxUSE_OLD_COCOA=0
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_wxUSE_OSX_IPHONE=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MICROWIN=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_X11=0
DEFAULT_wxUSE_DFB=0
-DEFAULT_DEFAULT_wxUSE_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OLD_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=0
DEFAULT_DEFAULT_wxUSE_OSX_COCOA=0
+DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=0
DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MICROWIN=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
PROGRAM_EXT=
SAMPLES_RPATH_FLAG=
-SAMPLES_RPATH_POSTLINK=
+DYLIB_RPATH_INSTALL=
+DYLIB_RPATH_POSTLINK=
DEFAULT_STD_FLAG=yes
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
+ *-*-qnx*)
+ USE_QNX=1
+ cat >>confdefs.h <<\_ACEOF
+#define __QNX__ 1
+_ACEOF
+
+ DEFAULT_DEFAULT_wxUSE_X11=1
+ ;;
*-*-solaris2* )
USE_SUN=1
USE_SOLARIS=1
DEFAULT_STD_FLAG=no
;;
+ arm-apple-darwin*)
+ USE_BSD=1
+ USE_DARWIN=1
+ cat >>confdefs.h <<\_ACEOF
+#define __BSD__ 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define __DARWIN__ 1
+_ACEOF
+
+ DEFAULT_DEFAULT_wxUSE_OSX_IPHONE=1
+ ;;
+
*-*-darwin* )
USE_BSD=1
USE_DARWIN=1
_ACEOF
DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
- DEFAULT_STD_FLAG=no
- ;;
- powerpc-apple-macos* )
- USE_UNIX=0
- ac_cv_c_bigendian=yes
- DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1
- DEFAULT_STD_FLAG=no
;;
*-*-beos* )
DEFAULT_wxUSE_ALL_FEATURES=yes
+DEFAULT_wxUSE_STD_CONTAINERS=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
DEFAULT_wxUSE_DMALLOC=no
DEFAULT_wxUSE_LIBGNOMEVFS=no
DEFAULT_wxUSE_LIBHILDON=no
+DEFAULT_wxUSE_LIBHILDON2=no
DEFAULT_wxUSE_LIBMSPACK=no
DEFAULT_wxUSE_LIBSDL=no
DEFAULT_wxUSE_ACCESSIBILITY=no
-DEFAULT_wxUSE_GRAPHICS_CONTEXT=no
DEFAULT_wxUSE_IPV6=no
DEFAULT_wxUSE_GSTREAMER8=no
+DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto
DEFAULT_wxUSE_UNICODE_UTF8=auto
DEFAULT_wxUSE_OPENGL=auto
DEFAULT_wxUSE_MEDIACTRL=auto
+DEFAULT_wxUSE_COMPILER_TLS=auto
DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
DEFAULT_wxUSE_UNIVERSAL_BINARY=no
+DEFAULT_wxUSE_MAC_ARCH=no
DEFAULT_wxUSE_OFFICIAL_BUILD=no
eval "$wx_cv_use_gui"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GUI = yes; then
- result=no
- else
+ if test $wxUSE_GUI = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GUI
eval "$wx_cv_use_monolithic"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MONOLITHIC = yes; then
- result=no
- else
+ if test $wxUSE_MONOLITHIC = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MONOLITHIC
eval "$wx_cv_use_plugins"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PLUGINS = yes; then
- result=no
- else
+ if test $wxUSE_PLUGINS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PLUGINS
eval "$wx_cv_use_official_build"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_OFFICIAL_BUILD = yes; then
- result=no
- else
+ if test $wxUSE_OFFICIAL_BUILD = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_OFFICIAL_BUILD
eval "$wx_cv_use_all_features"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ALL_FEATURES = yes; then
- result=no
- else
+ if test $wxUSE_ALL_FEATURES = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ALL_FEATURES
echo "${ECHO_T}$result" >&6; }
+if test "$wxUSE_ALL_FEATURES" = "no"; then
+ DEFAULT_wxUSE_ARTPROVIDER_TANGO=no
+ DEFAULT_wxUSE_MEDIACTRL=no
+fi
+
if test "$wxUSE_GUI" = "yes"; then
eval "$wx_cv_use_universal"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_UNIVERSAL = yes; then
- result=no
- else
+ if test $wxUSE_UNIVERSAL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_UNIVERSAL
fi
+# Check whether --with-osx_iphone was given.
+if test "${with_osx_iphone+set}" = set; then
+ withval=$with_osx_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-osx was given.
+if test "${with_osx+set}" = set; then
+ withval=$with_osx; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-carbon was given.
+if test "${with_carbon+set}" = set; then
+ withval=$with_carbon; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-cocoa was given.
+if test "${with_cocoa+set}" = set; then
+ withval=$with_cocoa; wxUSE_OSX_COCOA="$withval" CACHE_OSX_COCOA=1 TOOLKIT_GIVEN=1
+fi
+
+
+# Check whether --with-iphone was given.
+if test "${with_iphone+set}" = set; then
+ withval=$with_iphone; wxUSE_OSX_IPHONE="$withval" CACHE_OSX_IPHONE=1 TOOLKIT_GIVEN=1
+fi
+
+
# Check whether --with-mac was given.
if test "${with_mac+set}" = set; then
withval=$with_mac; wxUSE_OSX_CARBON="$withval" CACHE_OSX_CARBON=1 TOOLKIT_GIVEN=1
fi
-# Check whether --with-cocoa was given.
-if test "${with_cocoa+set}" = set; then
- withval=$with_cocoa; wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1
+# Check whether --with-old_cocoa was given.
+if test "${with_old_cocoa+set}" = set; then
+ withval=$with_old_cocoa; wxUSE_OLD_COCOA="$withval" CACHE_OLD_COCOA=1 TOOLKIT_GIVEN=1
fi
eval "$wx_cv_use_nanox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NANOX = yes; then
- result=no
- else
+ if test $wxUSE_NANOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NANOX
eval "$wx_cv_use_gpe"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GPE = yes; then
- result=no
- else
+ if test $wxUSE_GPE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GPE
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} \
+ NUM_TOOLKITS=`expr ${wxUSE_OLD_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_OSX_CARBON:-0} \
+ + ${wxUSE_OSX_COCOA:-0} + ${wxUSE_OSX_IPHONE:-0} + ${wxUSE_MGL:-0} + ${wxUSE_DFB:-0} \
+ ${wxUSE_MICROWIN:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
case "${host}" in
# to be removed when --disable-gtk2 isn't needed
if test "x$wxUSE_GTK2" = "xyes"; then
wxGTK_VERSION=2
+ wxUSE_GTK1=0
elif test "x$wxUSE_GTK2" = "xno"; then
wxGTK_VERSION=1
+ wxUSE_GTK1=1
fi
for toolkit in $ALL_TOOLKITS; do
fi
wxUSE_MAC=0
-if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1; then
+if test "$wxUSE_OSX_CARBON" = 1 \
+ -o "$wxUSE_OSX_COCOA" = 1 \
+ -o "$wxUSE_OSX_IPHONE" = 1; then
wxUSE_MAC=1
fi
echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; }
+{ echo "$as_me:$LINENO: checking for --enable-debug" >&5
+echo $ECHO_N "checking for --enable-debug... $ECHO_C" >&6; }
+# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+ enableval=$enable_debug;
+ if test "$enableval" = yes; then
+ wxUSE_DEBUG=yes
+ elif test "$enableval" = no; then
+ wxUSE_DEBUG=no
+ elif test "$enableval" = max; then
+ wxUSE_DEBUG=yes
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=2"
+ else
+ { { echo "$as_me:$LINENO: error: Invalid --enable-debug value, must be yes, no or max" >&5
+echo "$as_me: error: Invalid --enable-debug value, must be yes, no or max" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+else
+ wxUSE_DEBUG=default
+
+fi
+
+
+case "$wxUSE_DEBUG" in
+ yes)
+ DEFAULT_wxUSE_DEBUG_FLAG=yes
+ DEFAULT_wxUSE_DEBUG_INFO=yes
+
+ DEFAULT_wxUSE_OPTIMISE=no
+ ;;
+
+ no)
+ DEFAULT_wxUSE_DEBUG_FLAG=no
+ DEFAULT_wxUSE_DEBUG_INFO=no
+ ;;
+
+ default)
+ DEFAULT_wxUSE_DEBUG_FLAG=yes
+ DEFAULT_wxUSE_DEBUG_INFO=no
+ ;;
+esac
+
enablestring=disable
defaultval=
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
- # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
- enableval=$enable_shared;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
+ # Check whether --enable-debug_flag was given.
+if test "${enable_debug_flag+set}" = set; then
+ enableval=$enable_debug_flag;
if test "$enableval" = yes; then
- wx_cv_use_shared='wxUSE_SHARED=yes'
+ wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
else
- wx_cv_use_shared='wxUSE_SHARED=no'
+ wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
fi
else
- wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
+ wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
fi
- eval "$wx_cv_use_shared"
+ eval "$wx_cv_use_debug_flag"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SHARED = yes; then
- result=no
- else
+ if test $wxUSE_DEBUG_FLAG = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_SHARED
+ result=$wxUSE_DEBUG_FLAG
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug... $ECHO_C" >&6; }
- # Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
- enableval=$enable_debug;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
+ # Check whether --enable-debug_info was given.
+if test "${enable_debug_info+set}" = set; then
+ enableval=$enable_debug_info;
if test "$enableval" = yes; then
- wx_cv_use_debug='wxUSE_DEBUG=yes'
+ wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
else
- wx_cv_use_debug='wxUSE_DEBUG=no'
+ wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
fi
else
- wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}"
+ wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
fi
- eval "$wx_cv_use_debug"
+ eval "$wx_cv_use_debug_info"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DEBUG = yes; then
- result=no
- else
+ if test $wxUSE_DEBUG_INFO = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_DEBUG
+ result=$wxUSE_DEBUG_INFO
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=
if test -z "$defaultval"; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
- # Check whether --enable-stl was given.
-if test "${enable_stl+set}" = set; then
- enableval=$enable_stl;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
+ # Check whether --enable-debug_gdb was given.
+if test "${enable_debug_gdb+set}" = set; then
+ enableval=$enable_debug_gdb;
if test "$enableval" = yes; then
- wx_cv_use_stl='wxUSE_STL=yes'
+ wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
else
- wx_cv_use_stl='wxUSE_STL=no'
+ wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
fi
else
- wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
+ wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
fi
- eval "$wx_cv_use_stl"
+ eval "$wx_cv_use_debug_gdb"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STL = yes; then
- result=no
- else
+ if test $wxUSE_DEBUG_GDB = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_STL
+ result=$wxUSE_DEBUG_GDB
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; }
- # Check whether --enable-std_iostreams was given.
-if test "${enable_std_iostreams+set}" = set; then
- enableval=$enable_std_iostreams;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
+ # Check whether --enable-debug_cntxt was given.
+if test "${enable_debug_cntxt+set}" = set; then
+ enableval=$enable_debug_cntxt;
if test "$enableval" = yes; then
- wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+ wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
else
- wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+ wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
fi
else
- wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
+ wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
fi
- eval "$wx_cv_use_std_iostreams"
+ eval "$wx_cv_use_debug_cntxt"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STD_IOSTREAM = yes; then
- result=no
- else
+ if test $wxUSE_DEBUG_CONTEXT = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_STD_IOSTREAM
+ result=$wxUSE_DEBUG_CONTEXT
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; }
- # Check whether --enable-std_string was given.
-if test "${enable_std_string+set}" = set; then
- enableval=$enable_std_string;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
+ # Check whether --enable-mem_tracing was given.
+if test "${enable_mem_tracing+set}" = set; then
+ enableval=$enable_mem_tracing;
if test "$enableval" = yes; then
- wx_cv_use_std_string='wxUSE_STD_STRING=yes'
+ wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
else
- wx_cv_use_std_string='wxUSE_STD_STRING=no'
+ wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
fi
else
- wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
+ wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
fi
- eval "$wx_cv_use_std_string"
+ eval "$wx_cv_use_mem_tracing"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STD_STRING = yes; then
- result=no
- else
+ if test $wxUSE_MEM_TRACING = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_STD_STRING
+ result=$wxUSE_MEM_TRACING
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+
+
enablestring=disable
defaultval=
if test -z "$defaultval"; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
- # Check whether --enable-unicode was given.
-if test "${enable_unicode+set}" = set; then
- enableval=$enable_unicode;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-shared" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-shared... $ECHO_C" >&6; }
+ # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then
+ enableval=$enable_shared;
if test "$enableval" = yes; then
- wx_cv_use_unicode='wxUSE_UNICODE=yes'
+ wx_cv_use_shared='wxUSE_SHARED=yes'
else
- wx_cv_use_unicode='wxUSE_UNICODE=no'
+ wx_cv_use_shared='wxUSE_SHARED=no'
fi
else
- wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
+ wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}"
fi
- eval "$wx_cv_use_unicode"
+ eval "$wx_cv_use_shared"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_UNICODE = yes; then
- result=no
- else
+ if test $wxUSE_SHARED = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_UNICODE
+ result=$wxUSE_SHARED
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
- # Check whether --enable-mslu was given.
-if test "${enable_mslu+set}" = set; then
- enableval=$enable_mslu;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stl" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stl... $ECHO_C" >&6; }
+ # Check whether --enable-stl was given.
+if test "${enable_stl+set}" = set; then
+ enableval=$enable_stl;
if test "$enableval" = yes; then
- wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
+ wx_cv_use_stl='wxUSE_STL=yes'
else
- wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
+ wx_cv_use_stl='wxUSE_STL=no'
fi
else
- wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
+ wx_cv_use_stl='wxUSE_STL=${'DEFAULT_wxUSE_STL":-$defaultval}"
fi
- eval "$wx_cv_use_mslu"
+ eval "$wx_cv_use_stl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_UNICODE_MSLU = yes; then
- result=no
- else
+ if test $wxUSE_STL = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_UNICODE_MSLU
+ result=$wxUSE_STL
fi
{ echo "$as_me:$LINENO: result: $result" >&5
enablestring=
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
- # Check whether --enable-utf8 was given.
-if test "${enable_utf8+set}" = set; then
- enableval=$enable_utf8;
- wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
+ 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}-std_containers" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_containers... $ECHO_C" >&6; }
+ # Check whether --enable-std_containers was given.
+if test "${enable_std_containers+set}" = set; then
+ enableval=$enable_std_containers;
+ if test "$enableval" = yes; then
+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=yes'
+ else
+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=no'
+ fi
else
- wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+ wx_cv_use_std_containers='wxUSE_STD_CONTAINERS=${'DEFAULT_wxUSE_STD_CONTAINERS":-$defaultval}"
fi
- eval "$wx_cv_use_utf8"
+ eval "$wx_cv_use_std_containers"
- { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
-echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_STD_CONTAINERS = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_STD_CONTAINERS
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
enablestring=
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
- # Check whether --enable-utf8only was given.
-if test "${enable_utf8only+set}" = set; then
- enableval=$enable_utf8only;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_iostreams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_iostreams... $ECHO_C" >&6; }
+ # Check whether --enable-std_iostreams was given.
+if test "${enable_std_iostreams+set}" = set; then
+ enableval=$enable_std_iostreams;
if test "$enableval" = yes; then
- wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
+ wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
else
- wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
+ wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
fi
else
- wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
+ wx_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=${'DEFAULT_wxUSE_STD_IOSTREAM":-$defaultval}"
fi
- eval "$wx_cv_use_utf8only"
+ eval "$wx_cv_use_std_iostreams"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_UNICODE_UTF8_LOCALE = yes; then
- result=no
- else
+ if test $wxUSE_STD_IOSTREAM = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_UNICODE_UTF8_LOCALE
+ result=$wxUSE_STD_IOSTREAM
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; }
- # Check whether --enable-extended_rtti was given.
-if test "${enable_extended_rtti+set}" = set; then
- enableval=$enable_extended_rtti;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_string... $ECHO_C" >&6; }
+ # Check whether --enable-std_string was given.
+if test "${enable_std_string+set}" = set; then
+ enableval=$enable_std_string;
if test "$enableval" = yes; then
- wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
+ wx_cv_use_std_string='wxUSE_STD_STRING=yes'
else
- wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
+ wx_cv_use_std_string='wxUSE_STD_STRING=no'
fi
else
- wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
+ wx_cv_use_std_string='wxUSE_STD_STRING=${'DEFAULT_wxUSE_STD_STRING":-$defaultval}"
fi
- eval "$wx_cv_use_extended_rtti"
+ eval "$wx_cv_use_std_string"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_EXTENDED_RTTI = yes; then
- result=no
- else
+ if test $wxUSE_STD_STRING = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_EXTENDED_RTTI
+ result=$wxUSE_STD_STRING
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
-if test "$USE_OS2" = 1; then
- DEFAULT_wxUSE_OMF=no
enablestring=
defaultval=
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
- # Check whether --enable-omf was given.
-if test "${enable_omf+set}" = set; then
- enableval=$enable_omf;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-std_string_conv_in_wxstring" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-std_string_conv_in_wxstring... $ECHO_C" >&6; }
+ # Check whether --enable-std_string_conv_in_wxstring was given.
+if test "${enable_std_string_conv_in_wxstring+set}" = set; then
+ enableval=$enable_std_string_conv_in_wxstring;
if test "$enableval" = yes; then
- wx_cv_use_omf='wxUSE_OMF=yes'
+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=yes'
else
- wx_cv_use_omf='wxUSE_OMF=no'
+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=no'
fi
else
- wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
+ wx_cv_use_std_string_conv_in_wxstring='wxUSE_STD_STRING_CONV_IN_WXSTRING=${'DEFAULT_wxUSE_STD_STRING_CONV_IN_WXSTRING":-$defaultval}"
fi
- eval "$wx_cv_use_omf"
+ eval "$wx_cv_use_std_string_conv_in_wxstring"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_OMF = yes; then
- result=no
- else
+ if test $wxUSE_STD_STRING_CONV_IN_WXSTRING = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_OMF
+ result=$wxUSE_STD_STRING_CONV_IN_WXSTRING
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
-fi
-
-if test "$wxUSE_DEBUG" = "yes"; then
- 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
-fi
-
- enablestring=
+ enablestring=disable
defaultval=
if test -z "$defaultval"; then
if test x"$enablestring" = xdisable; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_flag" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_flag... $ECHO_C" >&6; }
- # Check whether --enable-debug_flag was given.
-if test "${enable_debug_flag+set}" = set; then
- enableval=$enable_debug_flag;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6; }
+ # Check whether --enable-unicode was given.
+if test "${enable_unicode+set}" = set; then
+ enableval=$enable_unicode;
if test "$enableval" = yes; then
- wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
+ wx_cv_use_unicode='wxUSE_UNICODE=yes'
else
- wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
+ wx_cv_use_unicode='wxUSE_UNICODE=no'
fi
else
- wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}"
+ wx_cv_use_unicode='wxUSE_UNICODE=${'DEFAULT_wxUSE_UNICODE":-$defaultval}"
fi
- eval "$wx_cv_use_debug_flag"
+ eval "$wx_cv_use_unicode"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DEBUG_FLAG = yes; then
- result=no
- else
+ if test $wxUSE_UNICODE = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_DEBUG_FLAG
+ result=$wxUSE_UNICODE
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_info" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_info... $ECHO_C" >&6; }
- # Check whether --enable-debug_info was given.
-if test "${enable_debug_info+set}" = set; then
- enableval=$enable_debug_info;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mslu" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mslu... $ECHO_C" >&6; }
+ # Check whether --enable-mslu was given.
+if test "${enable_mslu+set}" = set; then
+ enableval=$enable_mslu;
if test "$enableval" = yes; then
- wx_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
+ wx_cv_use_mslu='wxUSE_UNICODE_MSLU=yes'
else
- wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
+ wx_cv_use_mslu='wxUSE_UNICODE_MSLU=no'
fi
else
- wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}"
+ wx_cv_use_mslu='wxUSE_UNICODE_MSLU=${'DEFAULT_wxUSE_UNICODE_MSLU":-$defaultval}"
fi
- eval "$wx_cv_use_debug_info"
+ eval "$wx_cv_use_mslu"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DEBUG_INFO = yes; then
- result=no
- else
+ if test $wxUSE_UNICODE_MSLU = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_DEBUG_INFO
+ result=$wxUSE_UNICODE_MSLU
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
-if test "$wxUSE_DEBUG_FLAG" = "yes" -a "$wxUSE_DEBUG_INFO" = "yes"; then
- wxUSE_DEBUG=yes
- BUILD=debug
-fi
+ enablestring=
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6; }
+ # Check whether --enable-utf8 was given.
+if test "${enable_utf8+set}" = set; then
+ enableval=$enable_utf8;
+ wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
+
+else
+
+ wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
-if test "$wxUSE_DEBUG" = "yes"; then
- DEFAULT_wxUSE_OPTIMISE=no
fi
- enablestring=disable
+ eval "$wx_cv_use_utf8"
+
+ { echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
+echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6; }
+
+
+ enablestring=
defaultval=
if test -z "$defaultval"; then
if test x"$enablestring" = xdisable; then
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;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-utf8only" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-utf8only... $ECHO_C" >&6; }
+ # Check whether --enable-utf8only was given.
+if test "${enable_utf8only+set}" = set; then
+ enableval=$enable_utf8only;
if test "$enableval" = yes; then
- wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
+ wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=yes'
else
- wx_cv_use_optimise='wxUSE_OPTIMISE=no'
+ wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=no'
fi
else
- wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
+ wx_cv_use_utf8only='wxUSE_UNICODE_UTF8_LOCALE=${'DEFAULT_wxUSE_UNICODE_UTF8_LOCALE":-$defaultval}"
fi
- eval "$wx_cv_use_optimise"
+ eval "$wx_cv_use_utf8only"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_OPTIMISE = yes; then
- result=no
- else
+ if test $wxUSE_UNICODE_UTF8_LOCALE = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_OPTIMISE
+ result=$wxUSE_UNICODE_UTF8_LOCALE
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
-
enablestring=
defaultval=
if test -z "$defaultval"; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_gdb" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_gdb... $ECHO_C" >&6; }
- # Check whether --enable-debug_gdb was given.
-if test "${enable_debug_gdb+set}" = set; then
- enableval=$enable_debug_gdb;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-extended_rtti" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-extended_rtti... $ECHO_C" >&6; }
+ # Check whether --enable-extended_rtti was given.
+if test "${enable_extended_rtti+set}" = set; then
+ enableval=$enable_extended_rtti;
if test "$enableval" = yes; then
- wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+ wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=yes'
else
- wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+ wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=no'
fi
else
- wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}"
+ wx_cv_use_extended_rtti='wxUSE_EXTENDED_RTTI=${'DEFAULT_wxUSE_EXTENDED_RTTI":-$defaultval}"
fi
- eval "$wx_cv_use_debug_gdb"
+ eval "$wx_cv_use_extended_rtti"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DEBUG_GDB = yes; then
- result=no
- else
+ if test $wxUSE_EXTENDED_RTTI = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_DEBUG_GDB
+ result=$wxUSE_EXTENDED_RTTI
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+if test "$USE_OS2" = 1; then
+ DEFAULT_wxUSE_OMF=no
enablestring=
defaultval=
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-debug_cntxt" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-debug_cntxt... $ECHO_C" >&6; }
- # Check whether --enable-debug_cntxt was given.
-if test "${enable_debug_cntxt+set}" = set; then
- enableval=$enable_debug_cntxt;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-omf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-omf... $ECHO_C" >&6; }
+ # Check whether --enable-omf was given.
+if test "${enable_omf+set}" = set; then
+ enableval=$enable_omf;
if test "$enableval" = yes; then
- wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
+ wx_cv_use_omf='wxUSE_OMF=yes'
else
- wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
+ wx_cv_use_omf='wxUSE_OMF=no'
fi
else
- wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}"
+ wx_cv_use_omf='wxUSE_OMF=${'DEFAULT_wxUSE_OMF":-$defaultval}"
fi
- eval "$wx_cv_use_debug_cntxt"
+ eval "$wx_cv_use_omf"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DEBUG_CONTEXT = yes; then
- result=no
- else
+ if test $wxUSE_OMF = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_DEBUG_CONTEXT
+ result=$wxUSE_OMF
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+fi
- enablestring=
+
+ enablestring=disable
defaultval=
if test -z "$defaultval"; then
if test x"$enablestring" = xdisable; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mem_tracing" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mem_tracing... $ECHO_C" >&6; }
- # Check whether --enable-mem_tracing was given.
-if test "${enable_mem_tracing+set}" = set; then
- enableval=$enable_mem_tracing;
+ { 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_mem_tracing='wxUSE_MEM_TRACING=yes'
+ wx_cv_use_optimise='wxUSE_OPTIMISE=yes'
else
- wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+ wx_cv_use_optimise='wxUSE_OPTIMISE=no'
fi
else
- wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}"
+ wx_cv_use_optimise='wxUSE_OPTIMISE=${'DEFAULT_wxUSE_OPTIMISE":-$defaultval}"
fi
- eval "$wx_cv_use_mem_tracing"
+ eval "$wx_cv_use_optimise"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MEM_TRACING = yes; then
- result=no
- else
+ if test $wxUSE_OPTIMISE = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_MEM_TRACING
+ result=$wxUSE_OPTIMISE
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+
enablestring=
defaultval=
if test -z "$defaultval"; then
eval "$wx_cv_use_profile"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROFILE = yes; then
- result=no
- else
+ if test $wxUSE_PROFILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROFILE
eval "$wx_cv_use_no_rtti"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NO_RTTI = yes; then
- result=no
- else
+ if test $wxUSE_NO_RTTI = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NO_RTTI
eval "$wx_cv_use_no_exceptions"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NO_EXCEPTIONS = yes; then
- result=no
- else
+ if test $wxUSE_NO_EXCEPTIONS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NO_EXCEPTIONS
eval "$wx_cv_use_permissive"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PERMISSIVE = yes; then
- result=no
- else
+ if test $wxUSE_PERMISSIVE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PERMISSIVE
eval "$wx_cv_use_no_deps"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NO_DEPS = yes; then
- result=no
- else
+ if test $wxUSE_NO_DEPS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NO_DEPS
eval "$wx_cv_use_vararg_macros"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_VARARG_MACROS = yes; then
- result=no
- else
+ if test $wxUSE_VARARG_MACROS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_VARARG_MACROS
echo "${ECHO_T}$result" >&6; }
+
enablestring=
{ echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; }
echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
+ enablestring=
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-macosx_arch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-macosx_arch... $ECHO_C" >&6; }
+ # Check whether --enable-macosx_arch was given.
+if test "${enable_macosx_arch+set}" = set; then
+ enableval=$enable_macosx_arch;
+ wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'"
+
+else
+
+ wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH
+
+fi
+
+
+ eval "$wx_cv_use_macosx_arch"
+
+ { echo "$as_me:$LINENO: result: $wxUSE_MAC_ARCH" >&5
+echo "${ECHO_T}$wxUSE_MAC_ARCH" >&6; }
+
+
enablestring=
defaultval=
eval "$wx_cv_use_compat26"
if test x"$enablestring" = xdisable; then
- if test $WXWIN_COMPATIBILITY_2_6 = yes; then
- result=no
- else
+ if test $WXWIN_COMPATIBILITY_2_6 = no; then
result=yes
+ else
+ result=no
fi
else
result=$WXWIN_COMPATIBILITY_2_6
eval "$wx_cv_use_compat28"
if test x"$enablestring" = xdisable; then
- if test $WXWIN_COMPATIBILITY_2_8 = yes; then
- result=no
- else
+ if test $WXWIN_COMPATIBILITY_2_8 = no; then
result=yes
+ else
+ result=no
fi
else
result=$WXWIN_COMPATIBILITY_2_8
echo "${ECHO_T}$result" >&6; }
-cat >>confdefs.h <<\_ACEOF
-#define wxEVENTS_COMPATIBILITY_2_8 0
-_ACEOF
-
-
enablestring=disable
defaultval=
eval "$wx_cv_use_rpath"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_RPATH = yes; then
- result=no
- else
+ if test $wxUSE_RPATH = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_RPATH
eval "$wx_cv_use_objc_uniquifying"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_OBJC_UNIQUIFYING = yes; then
- result=no
- else
+ if test $wxUSE_OBJC_UNIQUIFYING = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_OBJC_UNIQUIFYING
eval "$wx_cv_use_visibility"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_VISIBILITY = yes; then
- result=no
- else
+ if test $wxUSE_VISIBILITY = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_VISIBILITY
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}-tls" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-tls... $ECHO_C" >&6; }
+ # Check whether --enable-tls was given.
+if test "${enable_tls+set}" = set; then
+ enableval=$enable_tls;
+ if test "$enableval" = yes; then
+ wx_cv_use_tls='wxUSE_COMPILER_TLS=yes'
+ else
+ wx_cv_use_tls='wxUSE_COMPILER_TLS=no'
+ fi
+
+else
+
+ wx_cv_use_tls='wxUSE_COMPILER_TLS=${'DEFAULT_wxUSE_COMPILER_TLS":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_tls"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_COMPILER_TLS = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_COMPILER_TLS
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
eval "$wx_cv_use_intl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_INTL = yes; then
- result=no
- else
+ if test $wxUSE_INTL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_INTL
eval "$wx_cv_use_xlocale"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_XLOCALE = yes; then
- result=no
- else
+ if test $wxUSE_XLOCALE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_XLOCALE
eval "$wx_cv_use_config"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CONFIG = yes; then
- result=no
- else
+ if test $wxUSE_CONFIG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CONFIG
eval "$wx_cv_use_protocols"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL
eval "$wx_cv_use_ftp"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL_FTP = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL_FTP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL_FTP
eval "$wx_cv_use_http"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL_HTTP = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL_HTTP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL_HTTP
eval "$wx_cv_use_fileproto"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL_FILE = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL_FILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL_FILE
eval "$wx_cv_use_sockets"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SOCKETS = yes; then
- result=no
- else
+ if test $wxUSE_SOCKETS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SOCKETS
eval "$wx_cv_use_ipv6"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_IPV6 = yes; then
- result=no
- else
+ if test $wxUSE_IPV6 = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_IPV6
eval "$wx_cv_use_ole"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_OLE = yes; then
- result=no
- else
+ if test $wxUSE_OLE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_OLE
eval "$wx_cv_use_dataobj"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DATAOBJ = yes; then
- result=no
- else
+ if test $wxUSE_DATAOBJ = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DATAOBJ
eval "$wx_cv_use_ipc"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_IPC = yes; then
- result=no
- else
+ if test $wxUSE_IPC = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_IPC
eval "$wx_cv_use_baseevtloop"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CONSOLE_EVENTLOOP = yes; then
- result=no
- else
+ if test $wxUSE_CONSOLE_EVENTLOOP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CONSOLE_EVENTLOOP
eval "$wx_cv_use_epollloop"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_EPOLL_DISPATCHER = yes; then
- result=no
- else
+ if test $wxUSE_EPOLL_DISPATCHER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_EPOLL_DISPATCHER
eval "$wx_cv_use_selectloop"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SELECT_DISPATCHER = yes; then
- result=no
- else
+ if test $wxUSE_SELECT_DISPATCHER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SELECT_DISPATCHER
+ 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}-any" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-any... $ECHO_C" >&6; }
+ # Check whether --enable-any was given.
+if test "${enable_any+set}" = set; then
+ enableval=$enable_any;
+ if test "$enableval" = yes; then
+ wx_cv_use_any='wxUSE_ANY=yes'
+ else
+ wx_cv_use_any='wxUSE_ANY=no'
+ fi
+
+else
+
+ wx_cv_use_any='wxUSE_ANY=${'DEFAULT_wxUSE_ANY":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_any"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_ANY = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_ANY
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_apple_ieee"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_APPLE_IEEE = yes; then
- result=no
- else
+ if test $wxUSE_APPLE_IEEE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_APPLE_IEEE
eval "$wx_cv_use_arcstream"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ARCHIVE_STREAMS = yes; then
- result=no
- else
+ if test $wxUSE_ARCHIVE_STREAMS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ARCHIVE_STREAMS
eval "$wx_cv_use_base64"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BASE64 = yes; then
- result=no
- else
+ if test $wxUSE_BASE64 = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_BASE64
eval "$wx_cv_use_backtrace"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STACKWALKER = yes; then
- result=no
- else
+ if test $wxUSE_STACKWALKER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STACKWALKER
eval "$wx_cv_use_catch_segvs"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ON_FATAL_EXCEPTION = yes; then
- result=no
- else
+ if test $wxUSE_ON_FATAL_EXCEPTION = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ON_FATAL_EXCEPTION
eval "$wx_cv_use_cmdline"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CMDLINE_PARSER = yes; then
- result=no
- else
+ if test $wxUSE_CMDLINE_PARSER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CMDLINE_PARSER
eval "$wx_cv_use_datetime"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DATETIME = yes; then
- result=no
- else
+ if test $wxUSE_DATETIME = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DATETIME
eval "$wx_cv_use_debugreport"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DEBUGREPORT = yes; then
- result=no
- else
+ if test $wxUSE_DEBUGREPORT = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DEBUGREPORT
eval "$wx_cv_use_dialupman"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DIALUP_MANAGER = yes; then
- result=no
- else
+ if test $wxUSE_DIALUP_MANAGER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DIALUP_MANAGER
eval "$wx_cv_use_dynlib"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DYNLIB_CLASS = yes; then
- result=no
- else
+ if test $wxUSE_DYNLIB_CLASS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DYNLIB_CLASS
eval "$wx_cv_use_dynamicloader"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DYNAMIC_LOADER = yes; then
- result=no
- else
+ if test $wxUSE_DYNAMIC_LOADER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DYNAMIC_LOADER
eval "$wx_cv_use_exceptions"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_EXCEPTIONS = yes; then
- result=no
- else
+ if test $wxUSE_EXCEPTIONS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_EXCEPTIONS
eval "$wx_cv_use_ffile"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FFILE = yes; then
- result=no
- else
+ if test $wxUSE_FFILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FFILE
eval "$wx_cv_use_file"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILE = yes; then
- result=no
- else
+ if test $wxUSE_FILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FILE
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}-filehistory" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filehistory... $ECHO_C" >&6; }
+ # Check whether --enable-filehistory was given.
+if test "${enable_filehistory+set}" = set; then
+ enableval=$enable_filehistory;
+ if test "$enableval" = yes; then
+ wx_cv_use_filehistory='wxUSE_FILE_HISTORY=yes'
+ else
+ wx_cv_use_filehistory='wxUSE_FILE_HISTORY=no'
+ fi
+
+else
+
+ wx_cv_use_filehistory='wxUSE_FILE_HISTORY=${'DEFAULT_wxUSE_FILE_HISTORY":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_filehistory"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_FILE_HISTORY = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_FILE_HISTORY
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_filesystem"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILESYSTEM = yes; then
- result=no
- else
+ if test $wxUSE_FILESYSTEM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FILESYSTEM
eval "$wx_cv_use_fontenum"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FONTENUM = yes; then
- result=no
- else
+ if test $wxUSE_FONTENUM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FONTENUM
eval "$wx_cv_use_fontmap"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FONTMAP = yes; then
- result=no
- else
+ if test $wxUSE_FONTMAP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FONTMAP
eval "$wx_cv_use_fs_archive"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FS_ARCHIVE = yes; then
- result=no
- else
+ if test $wxUSE_FS_ARCHIVE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FS_ARCHIVE
eval "$wx_cv_use_fs_inet"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FS_INET = yes; then
- result=no
- else
+ if test $wxUSE_FS_INET = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FS_INET
eval "$wx_cv_use_fs_zip"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FS_ZIP = yes; then
- result=no
- else
+ if test $wxUSE_FS_ZIP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FS_ZIP
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}-fswatcher" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fswatcher... $ECHO_C" >&6; }
+ # Check whether --enable-fswatcher was given.
+if test "${enable_fswatcher+set}" = set; then
+ enableval=$enable_fswatcher;
+ if test "$enableval" = yes; then
+ wx_cv_use_fswatcher='wxUSE_FSWATCHER=yes'
+ else
+ wx_cv_use_fswatcher='wxUSE_FSWATCHER=no'
+ fi
+
+else
+
+ wx_cv_use_fswatcher='wxUSE_FSWATCHER=${'DEFAULT_wxUSE_FSWATCHER":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_fswatcher"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_FSWATCHER = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_FSWATCHER
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_geometry"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GEOMETRY = yes; then
- result=no
- else
+ if test $wxUSE_GEOMETRY = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GEOMETRY
eval "$wx_cv_use_log"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOG = yes; then
- result=no
- else
+ if test $wxUSE_LOG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LOG
eval "$wx_cv_use_longlong"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LONGLONG = yes; then
- result=no
- else
+ if test $wxUSE_LONGLONG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LONGLONG
eval "$wx_cv_use_mimetype"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MIMETYPE = yes; then
- result=no
- else
+ if test $wxUSE_MIMETYPE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MIMETYPE
eval "$wx_cv_use_printfposparam"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PRINTF_POS_PARAMS = yes; then
- result=no
- else
+ if test $wxUSE_PRINTF_POS_PARAMS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PRINTF_POS_PARAMS
eval "$wx_cv_use_snglinst"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SNGLINST_CHECKER = yes; then
- result=no
- else
+ if test $wxUSE_SNGLINST_CHECKER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SNGLINST_CHECKER
eval "$wx_cv_use_sound"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SOUND = yes; then
- result=no
- else
+ if test $wxUSE_SOUND = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SOUND
eval "$wx_cv_use_stdpaths"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STDPATHS = yes; then
- result=no
- else
+ if test $wxUSE_STDPATHS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STDPATHS
eval "$wx_cv_use_stopwatch"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STOPWATCH = yes; then
- result=no
- else
+ if test $wxUSE_STOPWATCH = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STOPWATCH
eval "$wx_cv_use_streams"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STREAMS = yes; then
- result=no
- else
+ if test $wxUSE_STREAMS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STREAMS
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6; }
- # Check whether --enable-system_options was given.
-if test "${enable_system_options+set}" = set; then
- enableval=$enable_system_options;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-sysoptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-sysoptions... $ECHO_C" >&6; }
+ # Check whether --enable-sysoptions was given.
+if test "${enable_sysoptions+set}" = set; then
+ enableval=$enable_sysoptions;
if test "$enableval" = yes; then
- wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+ wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=yes'
else
- wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+ wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=no'
fi
else
- wx_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
+ wx_cv_use_sysoptions='wxUSE_SYSTEM_OPTIONS=${'DEFAULT_wxUSE_SYSTEM_OPTIONS":-$defaultval}"
fi
- eval "$wx_cv_use_system_options"
+ eval "$wx_cv_use_sysoptions"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SYSTEM_OPTIONS = yes; then
- result=no
- else
+ if test $wxUSE_SYSTEM_OPTIONS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SYSTEM_OPTIONS
eval "$wx_cv_use_tarstream"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TARSTREAM = yes; then
- result=no
- else
+ if test $wxUSE_TARSTREAM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TARSTREAM
eval "$wx_cv_use_textbuf"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TEXTBUFFER = yes; then
- result=no
- else
+ if test $wxUSE_TEXTBUFFER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TEXTBUFFER
eval "$wx_cv_use_textfile"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TEXTFILE = yes; then
- result=no
- else
+ if test $wxUSE_TEXTFILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TEXTFILE
eval "$wx_cv_use_timer"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TIMER = yes; then
- result=no
- else
+ if test $wxUSE_TIMER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TIMER
eval "$wx_cv_use_variant"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_VARIANT = yes; then
- result=no
- else
+ if test $wxUSE_VARIANT = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_VARIANT
eval "$wx_cv_use_zipstream"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ZIPSTREAM = yes; then
- result=no
- else
+ if test $wxUSE_ZIPSTREAM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ZIPSTREAM
eval "$wx_cv_use_url"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_URL = yes; then
- result=no
- else
+ if test $wxUSE_URL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_URL
eval "$wx_cv_use_protocol"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL
eval "$wx_cv_use_protocol_http"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL_HTTP = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL_HTTP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL_HTTP
eval "$wx_cv_use_protocol_ftp"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL_FTP = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL_FTP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL_FTP
eval "$wx_cv_use_protocol_file"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROTOCOL_FILE = yes; then
- result=no
- else
+ if test $wxUSE_PROTOCOL_FILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROTOCOL_FILE
eval "$wx_cv_use_threads"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_THREADS = yes; then
- result=no
- else
+ if test $wxUSE_THREADS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_THREADS
eval "$wx_cv_use_iniconf"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_INICONF = yes; then
- result=no
- else
+ if test $wxUSE_INICONF = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_INICONF
eval "$wx_cv_use_regkey"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_REGKEY = yes; then
- result=no
- else
+ if test $wxUSE_REGKEY = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_REGKEY
eval "$wx_cv_use_docview"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DOC_VIEW_ARCHITECTURE = yes; then
- result=no
- else
+ if test $wxUSE_DOC_VIEW_ARCHITECTURE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DOC_VIEW_ARCHITECTURE
eval "$wx_cv_use_help"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_HELP = yes; then
- result=no
- else
+ if test $wxUSE_HELP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_HELP
eval "$wx_cv_use_mshtmlhelp"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MS_HTML_HELP = yes; then
- result=no
- else
+ if test $wxUSE_MS_HTML_HELP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MS_HTML_HELP
eval "$wx_cv_use_html"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_HTML = yes; then
- result=no
- else
+ if test $wxUSE_HTML = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_HTML
eval "$wx_cv_use_htmlhelp"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_WXHTML_HELP = yes; then
- result=no
- else
+ if test $wxUSE_WXHTML_HELP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_WXHTML_HELP
eval "$wx_cv_use_xrc"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_XRC = yes; then
- result=no
- else
+ if test $wxUSE_XRC = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_XRC
eval "$wx_cv_use_aui"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_AUI = yes; then
- result=no
- else
+ if test $wxUSE_AUI = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_AUI
eval "$wx_cv_use_propgrid"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROPGRID = yes; then
- result=no
- else
+ if test $wxUSE_PROPGRID = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROPGRID
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}-ribbon" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ribbon... $ECHO_C" >&6; }
+ # Check whether --enable-ribbon was given.
+if test "${enable_ribbon+set}" = set; then
+ enableval=$enable_ribbon;
+ if test "$enableval" = yes; then
+ wx_cv_use_ribbon='wxUSE_RIBBON=yes'
+ else
+ wx_cv_use_ribbon='wxUSE_RIBBON=no'
+ fi
+
+else
+
+ wx_cv_use_ribbon='wxUSE_RIBBON=${'DEFAULT_wxUSE_RIBBON":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_ribbon"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_RIBBON = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_RIBBON
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_stc"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STC = yes; then
- result=no
- else
+ if test $wxUSE_STC = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STC
eval "$wx_cv_use_constraints"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CONSTRAINTS = yes; then
- result=no
- else
+ if test $wxUSE_CONSTRAINTS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CONSTRAINTS
eval "$wx_cv_use_loggui"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOGGUI = yes; then
- result=no
- else
+ if test $wxUSE_LOGGUI = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LOGGUI
eval "$wx_cv_use_logwin"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOGWINDOW = yes; then
- result=no
- else
+ if test $wxUSE_LOGWINDOW = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LOGWINDOW
eval "$wx_cv_use_logdialog"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LOGDIALOG = yes; then
- result=no
- else
+ if test $wxUSE_LOGDIALOG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LOGDIALOG
eval "$wx_cv_use_mdi"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MDI = yes; then
- result=no
- else
+ if test $wxUSE_MDI = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MDI
eval "$wx_cv_use_mdidoc"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MDI_ARCHITECTURE = yes; then
- result=no
- else
+ if test $wxUSE_MDI_ARCHITECTURE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MDI_ARCHITECTURE
eval "$wx_cv_use_mediactrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MEDIACTRL = yes; then
- result=no
- else
+ if test $wxUSE_MEDIACTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MEDIACTRL
eval "$wx_cv_use_gstreamer8"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GSTREAMER8 = yes; then
- result=no
- else
+ if test $wxUSE_GSTREAMER8 = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GSTREAMER8
eval "$wx_cv_use_webkit"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_WEBKIT = yes; then
- result=no
- else
+ if test $wxUSE_WEBKIT = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_WEBKIT
eval "$wx_cv_use_richtext"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_RICHTEXT = yes; then
- result=no
- else
+ if test $wxUSE_RICHTEXT = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_RICHTEXT
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
- # Check whether --enable-graphics_ctx was given.
-if test "${enable_graphics_ctx+set}" = set; then
- enableval=$enable_graphics_ctx;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; }
+ # Check whether --enable-postscript was given.
+if test "${enable_postscript+set}" = set; then
+ enableval=$enable_postscript;
if test "$enableval" = yes; then
- wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
+ wx_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
else
- wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
+ wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
fi
else
- wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
+ wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
fi
- eval "$wx_cv_use_graphics_ctx"
+ eval "$wx_cv_use_postscript"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GRAPHICS_CONTEXT = yes; then
- result=no
- else
+ if test $wxUSE_POSTSCRIPT = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_GRAPHICS_CONTEXT
+ result=$wxUSE_POSTSCRIPT
fi
{ echo "$as_me:$LINENO: result: $result" >&5
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-postscript" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-postscript... $ECHO_C" >&6; }
- # Check whether --enable-postscript was given.
-if test "${enable_postscript+set}" = set; then
- enableval=$enable_postscript;
+ { 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_postscript='wxUSE_POSTSCRIPT=yes'
+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
else
- wx_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
fi
else
- wx_cv_use_postscript='wxUSE_POSTSCRIPT=${'DEFAULT_wxUSE_POSTSCRIPT":-$defaultval}"
+ wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
fi
- eval "$wx_cv_use_postscript"
+ eval "$wx_cv_use_printarch"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_POSTSCRIPT = yes; then
- result=no
- else
+ if test $wxUSE_PRINTING_ARCHITECTURE = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_POSTSCRIPT
+ result=$wxUSE_PRINTING_ARCHITECTURE
fi
{ echo "$as_me:$LINENO: result: $result" >&5
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}-svg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; }
+ # Check whether --enable-svg was given.
+if test "${enable_svg+set}" = set; then
+ enableval=$enable_svg;
if test "$enableval" = yes; then
- wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+ wx_cv_use_svg='wxUSE_SVG=yes'
else
- wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+ wx_cv_use_svg='wxUSE_SVG=no'
fi
else
- wx_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=${'DEFAULT_wxUSE_PRINTING_ARCHITECTURE":-$defaultval}"
+ wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
fi
- eval "$wx_cv_use_printarch"
+ eval "$wx_cv_use_svg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PRINTING_ARCHITECTURE = yes; then
- result=no
- else
+ if test $wxUSE_SVG = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_PRINTING_ARCHITECTURE
+ result=$wxUSE_SVG
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+if test "$wxUSE_MAC" != 1; then
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
fi
fi
- { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-svg" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-svg... $ECHO_C" >&6; }
- # Check whether --enable-svg was given.
-if test "${enable_svg+set}" = set; then
- enableval=$enable_svg;
+ { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-graphics_ctx" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-graphics_ctx... $ECHO_C" >&6; }
+ # Check whether --enable-graphics_ctx was given.
+if test "${enable_graphics_ctx+set}" = set; then
+ enableval=$enable_graphics_ctx;
if test "$enableval" = yes; then
- wx_cv_use_svg='wxUSE_SVG=yes'
+ wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=yes'
else
- wx_cv_use_svg='wxUSE_SVG=no'
+ wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=no'
fi
else
- wx_cv_use_svg='wxUSE_SVG=${'DEFAULT_wxUSE_SVG":-$defaultval}"
+ wx_cv_use_graphics_ctx='wxUSE_GRAPHICS_CONTEXT=${'DEFAULT_wxUSE_GRAPHICS_CONTEXT":-$defaultval}"
fi
- eval "$wx_cv_use_svg"
+ eval "$wx_cv_use_graphics_ctx"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SVG = yes; then
- result=no
- else
+ if test $wxUSE_GRAPHICS_CONTEXT = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_SVG
+ result=$wxUSE_GRAPHICS_CONTEXT
fi
{ echo "$as_me:$LINENO: result: $result" >&5
echo "${ECHO_T}$result" >&6; }
+fi
eval "$wx_cv_use_clipboard"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CLIPBOARD = yes; then
- result=no
- else
+ if test $wxUSE_CLIPBOARD = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CLIPBOARD
eval "$wx_cv_use_dnd"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DRAG_AND_DROP = yes; then
- result=no
- else
+ if test $wxUSE_DRAG_AND_DROP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DRAG_AND_DROP
eval "$wx_cv_use_metafile"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_METAFILE = yes; then
- result=no
- else
+ if test $wxUSE_METAFILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_METAFILE
eval "$wx_cv_use_controls"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CONTROLS = yes; then
- result=no
- else
+ if test $wxUSE_CONTROLS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CONTROLS
DEFAULT_wxUSE_COLOURPICKERCTRL=no
DEFAULT_wxUSE_COMBOBOX=no
DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_COMMANDLINKBUTTON=no
DEFAULT_wxUSE_DATAVIEWCTRL=no
DEFAULT_wxUSE_DATEPICKCTRL=no
DEFAULT_wxUSE_DETECT_SM=no
DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
+ DEFAULT_wxUSE_MARKUP=no
DEFAULT_wxUSE_NOTEBOOK=no
DEFAULT_wxUSE_POPUPWIN=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
+ DEFAULT_wxUSE_RICHMSGDLG=no
DEFAULT_wxUSE_REARRANGECTRL=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_SCROLLBAR=no
fi
+ 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}-markup" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-markup... $ECHO_C" >&6; }
+ # Check whether --enable-markup was given.
+if test "${enable_markup+set}" = set; then
+ enableval=$enable_markup;
+ if test "$enableval" = yes; then
+ wx_cv_use_markup='wxUSE_MARKUP=yes'
+ else
+ wx_cv_use_markup='wxUSE_MARKUP=no'
+ fi
+
+else
+
+ wx_cv_use_markup='wxUSE_MARKUP=${'DEFAULT_wxUSE_MARKUP":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_markup"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_MARKUP = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_MARKUP
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_accel"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ACCEL = yes; then
- result=no
- else
+ if test $wxUSE_ACCEL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ACCEL
eval "$wx_cv_use_animatectrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ANIMATIONCTRL = yes; then
+ if test $wxUSE_ANIMATIONCTRL = no; then
+ result=yes
+ else
result=no
+ fi
+ else
+ result=$wxUSE_ANIMATIONCTRL
+ 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}-artstd" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-artstd... $ECHO_C" >&6; }
+ # Check whether --enable-artstd was given.
+if test "${enable_artstd+set}" = set; then
+ enableval=$enable_artstd;
+ if test "$enableval" = yes; then
+ wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=yes'
+ else
+ wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=no'
+ fi
+
+else
+
+ wx_cv_use_artstd='wxUSE_ARTPROVIDER_STD=${'DEFAULT_wxUSE_ARTPROVIDER_STD":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_artstd"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_ARTPROVIDER_STD = no; then
+ result=yes
else
+ result=no
+ fi
+ else
+ result=$wxUSE_ARTPROVIDER_STD
+ 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}-arttango" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-arttango... $ECHO_C" >&6; }
+ # Check whether --enable-arttango was given.
+if test "${enable_arttango+set}" = set; then
+ enableval=$enable_arttango;
+ if test "$enableval" = yes; then
+ wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=yes'
+ else
+ wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=no'
+ fi
+
+else
+
+ wx_cv_use_arttango='wxUSE_ARTPROVIDER_TANGO=${'DEFAULT_wxUSE_ARTPROVIDER_TANGO":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_arttango"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_ARTPROVIDER_TANGO = no; then
result=yes
+ else
+ result=no
fi
else
- result=$wxUSE_ANIMATIONCTRL
+ result=$wxUSE_ARTPROVIDER_TANGO
fi
{ echo "$as_me:$LINENO: result: $result" >&5
eval "$wx_cv_use_bmpbutton"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BMPBUTTON = yes; then
- result=no
- else
+ if test $wxUSE_BMPBUTTON = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_BMPBUTTON
eval "$wx_cv_use_bmpcombobox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BITMAPCOMBOBOX = yes; then
- result=no
- else
+ if test $wxUSE_BITMAPCOMBOBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_BITMAPCOMBOBOX
eval "$wx_cv_use_button"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BUTTON = yes; then
- result=no
- else
+ if test $wxUSE_BUTTON = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_BUTTON
eval "$wx_cv_use_calendar"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CALCTRL = yes; then
- result=no
- else
+ if test $wxUSE_CALCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CALCTRL
eval "$wx_cv_use_caret"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CARET = yes; then
- result=no
- else
+ if test $wxUSE_CARET = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CARET
eval "$wx_cv_use_checkbox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CHECKBOX = yes; then
- result=no
- else
+ if test $wxUSE_CHECKBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CHECKBOX
eval "$wx_cv_use_checklst"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CHECKLST = yes; then
- result=no
- else
+ if test $wxUSE_CHECKLST = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CHECKLST
eval "$wx_cv_use_choice"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CHOICE = yes; then
- result=no
- else
+ if test $wxUSE_CHOICE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CHOICE
eval "$wx_cv_use_choicebook"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CHOICEBOOK = yes; then
- result=no
- else
+ if test $wxUSE_CHOICEBOOK = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CHOICEBOOK
eval "$wx_cv_use_collpane"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_COLLPANE = yes; then
- result=no
- else
+ if test $wxUSE_COLLPANE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_COLLPANE
eval "$wx_cv_use_colourpicker"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_COLOURPICKERCTRL = yes; then
- result=no
- else
+ if test $wxUSE_COLOURPICKERCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_COLOURPICKERCTRL
eval "$wx_cv_use_combobox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_COMBOBOX = yes; then
- result=no
- else
+ if test $wxUSE_COMBOBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_COMBOBOX
eval "$wx_cv_use_comboctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_COMBOCTRL = yes; then
- result=no
- else
+ if test $wxUSE_COMBOCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_COMBOCTRL
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}-commandlinkbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-commandlinkbutton... $ECHO_C" >&6; }
+ # Check whether --enable-commandlinkbutton was given.
+if test "${enable_commandlinkbutton+set}" = set; then
+ enableval=$enable_commandlinkbutton;
+ if test "$enableval" = yes; then
+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes'
+ else
+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no'
+ fi
+
+else
+
+ wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_commandlinkbutton"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_COMMANDLINKBUTTON = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_COMMANDLINKBUTTON
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_dataviewctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DATAVIEWCTRL = yes; then
- result=no
- else
+ if test $wxUSE_DATAVIEWCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DATAVIEWCTRL
eval "$wx_cv_use_datepick"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DATEPICKCTRL = yes; then
- result=no
- else
+ if test $wxUSE_DATEPICKCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DATEPICKCTRL
eval "$wx_cv_use_detect_sm"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DETECT_SM = yes; then
- result=no
- else
+ if test $wxUSE_DETECT_SM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DETECT_SM
eval "$wx_cv_use_dirpicker"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DIRPICKERCTRL = yes; then
- result=no
- else
+ if test $wxUSE_DIRPICKERCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DIRPICKERCTRL
eval "$wx_cv_use_display"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DISPLAY = yes; then
- result=no
- else
+ if test $wxUSE_DISPLAY = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DISPLAY
eval "$wx_cv_use_editablebox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_EDITABLELISTBOX = yes; then
- result=no
- else
+ if test $wxUSE_EDITABLELISTBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_EDITABLELISTBOX
eval "$wx_cv_use_filectrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILECTRL = yes; then
- result=no
- else
+ if test $wxUSE_FILECTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FILECTRL
eval "$wx_cv_use_filepicker"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILEPICKERCTRL = yes; then
- result=no
- else
+ if test $wxUSE_FILEPICKERCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FILEPICKERCTRL
eval "$wx_cv_use_fontpicker"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FONTPICKERCTRL = yes; then
- result=no
- else
+ if test $wxUSE_FONTPICKERCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FONTPICKERCTRL
eval "$wx_cv_use_gauge"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GAUGE = yes; then
- result=no
- else
+ if test $wxUSE_GAUGE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GAUGE
eval "$wx_cv_use_grid"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GRID = yes; then
- result=no
- else
+ if test $wxUSE_GRID = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GRID
eval "$wx_cv_use_headerctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_HEADERCTRL = yes; then
- result=no
- else
+ if test $wxUSE_HEADERCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_HEADERCTRL
eval "$wx_cv_use_hyperlink"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_HYPERLINKCTRL = yes; then
- result=no
- else
+ if test $wxUSE_HYPERLINKCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_HYPERLINKCTRL
eval "$wx_cv_use_imaglist"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_IMAGLIST = yes; then
- result=no
- else
+ if test $wxUSE_IMAGLIST = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_IMAGLIST
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}-infobar" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-infobar... $ECHO_C" >&6; }
+ # Check whether --enable-infobar was given.
+if test "${enable_infobar+set}" = set; then
+ enableval=$enable_infobar;
+ if test "$enableval" = yes; then
+ wx_cv_use_infobar='wxUSE_INFOBAR=yes'
+ else
+ wx_cv_use_infobar='wxUSE_INFOBAR=no'
+ fi
+
+else
+
+ wx_cv_use_infobar='wxUSE_INFOBAR=${'DEFAULT_wxUSE_INFOBAR":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_infobar"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_INFOBAR = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_INFOBAR
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_listbook"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LISTBOOK = yes; then
- result=no
- else
+ if test $wxUSE_LISTBOOK = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LISTBOOK
eval "$wx_cv_use_listbox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LISTBOX = yes; then
- result=no
- else
+ if test $wxUSE_LISTBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LISTBOX
eval "$wx_cv_use_listctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_LISTCTRL = yes; then
- result=no
- else
+ if test $wxUSE_LISTCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_LISTCTRL
eval "$wx_cv_use_notebook"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NOTEBOOK = yes; then
- result=no
- else
+ if test $wxUSE_NOTEBOOK = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NOTEBOOK
eval "$wx_cv_use_notifmsg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NOTIFICATION_MESSAGE = yes; then
- result=no
- else
+ if test $wxUSE_NOTIFICATION_MESSAGE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NOTIFICATION_MESSAGE
eval "$wx_cv_use_odcombobox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ODCOMBOBOX = yes; then
- result=no
- else
+ if test $wxUSE_ODCOMBOBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ODCOMBOBOX
eval "$wx_cv_use_popupwin"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_POPUPWIN = yes; then
- result=no
- else
+ if test $wxUSE_POPUPWIN = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_POPUPWIN
eval "$wx_cv_use_radiobox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_RADIOBOX = yes; then
- result=no
- else
+ if test $wxUSE_RADIOBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_RADIOBOX
eval "$wx_cv_use_radiobtn"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_RADIOBTN = yes; then
- result=no
- else
+ if test $wxUSE_RADIOBTN = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_RADIOBTN
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}-richmsgdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-richmsgdlg... $ECHO_C" >&6; }
+ # Check whether --enable-richmsgdlg was given.
+if test "${enable_richmsgdlg+set}" = set; then
+ enableval=$enable_richmsgdlg;
+ if test "$enableval" = yes; then
+ wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes'
+ else
+ wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no'
+ fi
+
+else
+
+ wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_richmsgdlg"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_RICHMSGDLG = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_RICHMSGDLG
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
defaultval=$wxUSE_ALL_FEATURES
if test -z "$defaultval"; then
eval "$wx_cv_use_rearrangectrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_REARRANGECTRL = yes; then
- result=no
- else
+ if test $wxUSE_REARRANGECTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_REARRANGECTRL
eval "$wx_cv_use_sash"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SASH = yes; then
- result=no
- else
+ if test $wxUSE_SASH = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SASH
eval "$wx_cv_use_scrollbar"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SCROLLBAR = yes; then
- result=no
- else
+ if test $wxUSE_SCROLLBAR = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SCROLLBAR
eval "$wx_cv_use_searchctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SEARCHCTRL = yes; then
- result=no
- else
+ if test $wxUSE_SEARCHCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SEARCHCTRL
eval "$wx_cv_use_slider"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SLIDER = yes; then
- result=no
- else
+ if test $wxUSE_SLIDER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SLIDER
eval "$wx_cv_use_spinbtn"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SPINBTN = yes; then
- result=no
- else
+ if test $wxUSE_SPINBTN = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SPINBTN
eval "$wx_cv_use_spinctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SPINCTRL = yes; then
- result=no
- else
+ if test $wxUSE_SPINCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SPINCTRL
eval "$wx_cv_use_splitter"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SPLITTER = yes; then
- result=no
- else
+ if test $wxUSE_SPLITTER = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SPLITTER
eval "$wx_cv_use_statbmp"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STATBMP = yes; then
- result=no
- else
+ if test $wxUSE_STATBMP = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STATBMP
eval "$wx_cv_use_statbox"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STATBOX = yes; then
- result=no
- else
+ if test $wxUSE_STATBOX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STATBOX
eval "$wx_cv_use_statline"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STATLINE = yes; then
- result=no
- else
+ if test $wxUSE_STATLINE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STATLINE
eval "$wx_cv_use_stattext"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STATTEXT = yes; then
- result=no
- else
+ if test $wxUSE_STATTEXT = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STATTEXT
eval "$wx_cv_use_statusbar"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STATUSBAR = yes; then
- result=no
- else
+ if test $wxUSE_STATUSBAR = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STATUSBAR
eval "$wx_cv_use_taskbaricon"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TASKBARICON = yes; then
- result=no
- else
+ if test $wxUSE_TASKBARICON = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TASKBARICON
eval "$wx_cv_use_tbarnative"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOOLBAR_NATIVE = yes; then
- result=no
- else
+ if test $wxUSE_TOOLBAR_NATIVE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TOOLBAR_NATIVE
eval "$wx_cv_use_textctrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TEXTCTRL = yes; then
- result=no
- else
+ if test $wxUSE_TEXTCTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TEXTCTRL
eval "$wx_cv_use_tipwindow"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TIPWINDOW = yes; then
- result=no
- else
+ if test $wxUSE_TIPWINDOW = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TIPWINDOW
eval "$wx_cv_use_togglebtn"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOGGLEBTN = yes; then
- result=no
- else
+ if test $wxUSE_TOGGLEBTN = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TOGGLEBTN
eval "$wx_cv_use_toolbar"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOOLBAR = yes; then
- result=no
- else
+ if test $wxUSE_TOOLBAR = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TOOLBAR
eval "$wx_cv_use_toolbook"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOOLBOOK = yes; then
- result=no
- else
+ if test $wxUSE_TOOLBOOK = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TOOLBOOK
eval "$wx_cv_use_treebook"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TREEBOOK = yes; then
- result=no
- else
+ if test $wxUSE_TREEBOOK = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TREEBOOK
eval "$wx_cv_use_treectrl"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TREECTRL = yes; then
- result=no
- else
+ if test $wxUSE_TREECTRL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TREECTRL
eval "$wx_cv_use_commondlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_COMMONDLGS = yes; then
- result=no
- else
+ if test $wxUSE_COMMONDLGS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_COMMONDLGS
eval "$wx_cv_use_aboutdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ABOUTDLG = yes; then
- result=no
- else
+ if test $wxUSE_ABOUTDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ABOUTDLG
eval "$wx_cv_use_choicedlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_CHOICEDLG = yes; then
- result=no
- else
+ if test $wxUSE_CHOICEDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_CHOICEDLG
eval "$wx_cv_use_coldlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_COLOURDLG = yes; then
- result=no
- else
+ if test $wxUSE_COLOURDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_COLOURDLG
eval "$wx_cv_use_filedlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FILEDLG = yes; then
- result=no
- else
+ if test $wxUSE_FILEDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FILEDLG
eval "$wx_cv_use_finddlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FINDREPLDLG = yes; then
- result=no
- else
+ if test $wxUSE_FINDREPLDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FINDREPLDLG
eval "$wx_cv_use_fontdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_FONTDLG = yes; then
- result=no
- else
+ if test $wxUSE_FONTDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_FONTDLG
eval "$wx_cv_use_dirdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DIRDLG = yes; then
- result=no
- else
+ if test $wxUSE_DIRDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DIRDLG
eval "$wx_cv_use_msgdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MSGDLG = yes; then
- result=no
- else
+ if test $wxUSE_MSGDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MSGDLG
eval "$wx_cv_use_numberdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_NUMBERDLG = yes; then
- result=no
- else
+ if test $wxUSE_NUMBERDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_NUMBERDLG
eval "$wx_cv_use_splash"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SPLASH = yes; then
- result=no
- else
+ if test $wxUSE_SPLASH = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SPLASH
eval "$wx_cv_use_textdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TEXTDLG = yes; then
- result=no
- else
+ if test $wxUSE_TEXTDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TEXTDLG
eval "$wx_cv_use_tipdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_STARTUP_TIPS = yes; then
- result=no
- else
+ if test $wxUSE_STARTUP_TIPS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_STARTUP_TIPS
eval "$wx_cv_use_progressdlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PROGRESSDLG = yes; then
- result=no
- else
+ if test $wxUSE_PROGRESSDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PROGRESSDLG
eval "$wx_cv_use_wizarddlg"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_WIZARDDLG = yes; then
- result=no
- else
+ if test $wxUSE_WIZARDDLG = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_WIZARDDLG
eval "$wx_cv_use_menus"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MENUS = yes; then
- result=no
- else
+ if test $wxUSE_MENUS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MENUS
eval "$wx_cv_use_miniframe"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MINIFRAME = yes; then
- result=no
- else
+ if test $wxUSE_MINIFRAME = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MINIFRAME
eval "$wx_cv_use_tooltips"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TOOLTIPS = yes; then
- result=no
- else
+ if test $wxUSE_TOOLTIPS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TOOLTIPS
eval "$wx_cv_use_splines"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_SPLINES = yes; then
- result=no
- else
+ if test $wxUSE_SPLINES = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_SPLINES
eval "$wx_cv_use_mousewheel"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_MOUSEWHEEL = yes; then
- result=no
- else
+ if test $wxUSE_MOUSEWHEEL = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_MOUSEWHEEL
eval "$wx_cv_use_validators"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_VALIDATORS = yes; then
- result=no
- else
+ if test $wxUSE_VALIDATORS = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_VALIDATORS
eval "$wx_cv_use_busyinfo"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_BUSYINFO = yes; then
- result=no
- else
+ if test $wxUSE_BUSYINFO = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_BUSYINFO
eval "$wx_cv_use_joystick"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_JOYSTICK = yes; then
- result=no
- else
+ if test $wxUSE_JOYSTICK = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_JOYSTICK
eval "$wx_cv_use_metafile"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_METAFILE = yes; then
- result=no
- else
+ if test $wxUSE_METAFILE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_METAFILE
eval "$wx_cv_use_dragimage"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DRAGIMAGE = yes; then
- result=no
- else
+ if test $wxUSE_DRAGIMAGE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DRAGIMAGE
eval "$wx_cv_use_accessibility"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ACCESSIBILITY = yes; then
- result=no
- else
+ if test $wxUSE_ACCESSIBILITY = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ACCESSIBILITY
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}-uiactionsim" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-uiactionsim... $ECHO_C" >&6; }
+ # Check whether --enable-uiactionsim was given.
+if test "${enable_uiactionsim+set}" = set; then
+ enableval=$enable_uiactionsim;
+ if test "$enableval" = yes; then
+ wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=yes'
+ else
+ wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=no'
+ fi
+
+else
+
+ wx_cv_use_uiactionsim='wxUSE_UIACTIONSIMULATOR=${'DEFAULT_wxUSE_UIACTIONSIMULATOR":-$defaultval}"
+
+fi
+
+
+ eval "$wx_cv_use_uiactionsim"
+
+ if test x"$enablestring" = xdisable; then
+ if test $wxUSE_UIACTIONSIMULATOR = no; then
+ result=yes
+ else
+ result=no
+ fi
+ else
+ result=$wxUSE_UIACTIONSIMULATOR
+ fi
+
+ { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+
enablestring=
eval "$wx_cv_use_palette"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PALETTE = yes; then
- result=no
- else
+ if test $wxUSE_PALETTE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PALETTE
eval "$wx_cv_use_image"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_IMAGE = yes; then
- result=no
- else
+ if test $wxUSE_IMAGE = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_IMAGE
eval "$wx_cv_use_gif"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_GIF = yes; then
- result=no
- else
+ if test $wxUSE_GIF = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_GIF
eval "$wx_cv_use_pcx"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PCX = yes; then
- result=no
- else
+ if test $wxUSE_PCX = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PCX
eval "$wx_cv_use_tga"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_TGA = yes; then
- result=no
- else
+ if test $wxUSE_TGA = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_TGA
eval "$wx_cv_use_iff"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_IFF = yes; then
- result=no
- else
+ if test $wxUSE_IFF = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_IFF
eval "$wx_cv_use_pnm"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_PNM = yes; then
- result=no
- else
+ if test $wxUSE_PNM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_PNM
eval "$wx_cv_use_xpm"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_XPM = yes; then
- result=no
- else
+ if test $wxUSE_XPM = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_XPM
eval "$wx_cv_use_ico_cur"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_ICO_CUR = yes; then
- result=no
- else
+ if test $wxUSE_ICO_CUR = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_ICO_CUR
eval "$wx_cv_use_dccache"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DC_CACHEING = yes; then
- result=no
- else
+ if test $wxUSE_DC_CACHEING = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DC_CACHEING
eval "$wx_cv_use_ps_in_msw"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = yes; then
- result=no
- else
+ if test $wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW
eval "$wx_cv_use_ownerdrawn"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_OWNER_DRAWN = yes; then
- result=no
- else
+ if test $wxUSE_OWNER_DRAWN = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_OWNER_DRAWN
eval "$wx_cv_use_uxtheme"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_UXTHEME = yes; then
- result=no
- else
+ if test $wxUSE_UXTHEME = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_UXTHEME
eval "$wx_cv_use_wxdib"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_DIB = yes; then
- result=no
- else
+ if test $wxUSE_DIB = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_DIB
eval "$wx_cv_use_autoidman"
if test x"$enablestring" = xdisable; then
- if test $wxUSE_AUTOID_MANAGEMENT = yes; then
- result=no
- else
+ if test $wxUSE_AUTOID_MANAGEMENT = no; then
result=yes
+ else
+ result=no
fi
else
result=$wxUSE_AUTOID_MANAGEMENT
rm -f confcache
CFLAGS=${CFLAGS:=}
-
-
-
- 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'
+
+
+
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
CXXFLAGS=${CXXFLAGS:=}
-
-
-
- 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_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
fi
fi
+
+if test "$wxUSE_MAC" = 1; then
+
retest_macosx_linking=no
-#if test "$wxUSE_MAC" = 1; then
+OSX_ARCH_OPTS=""
+if test "x$wxUSE_MAC_ARCH" != xno; then
+ OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH"
+fi
+
if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
# Implicitly turn on the new --with-macosx-sdk using the default
- # SDK which provides the behavior this option has always had.
+ # SDK which provides the behaviour this option has always had.
if test "x$wxUSE_MACOSX_SDK" = "x"; then
{ echo "$as_me:$LINENO: WARNING: Enabling default SDK due to --enable-universal_binary." >&5
echo "$as_me: WARNING: Enabling default SDK due to --enable-universal_binary." >&2;}
echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
fi
fi
- OSX_UNIV_OPTS="-arch ppc -arch i386"
- CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
- CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
- OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS"
- OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS"
- LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
+ OSX_ARCH_OPTS="-arch ppc -arch i386"
+ if test "$wxUSE_OSX_COCOA" = 1; then
+ OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64"
+ fi
+ { echo "$as_me:$LINENO: checking for universal binary architectures" >&5
+echo $ECHO_N "checking for universal binary architectures... $ECHO_C" >&6; }
+ { echo "$as_me:$LINENO: result: $OSX_ARCH_OPTS" >&5
+echo "${ECHO_T}$OSX_ARCH_OPTS" >&6; }
+
retest_macosx_linking=yes
{ echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5
echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;}
bk_use_pch=no
fi
-#fi
+
+CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
+LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
if test "x$wxUSE_MACOSX_SDK" = "xno"; then
wxUSE_MACOSX_SDK=
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
+ for ac_prog in sw_vers
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_prog_OSX_SW_VERS+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$OSX_SW_VERS"; then
+ ac_cv_prog_OSX_SW_VERS="$OSX_SW_VERS" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_OSX_SW_VERS="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+OSX_SW_VERS=$ac_cv_prog_OSX_SW_VERS
+if test -n "$OSX_SW_VERS"; then
+ { echo "$as_me:$LINENO: result: $OSX_SW_VERS" >&5
+echo "${ECHO_T}$OSX_SW_VERS" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ test -n "$OSX_SW_VERS" && break
+done
+
+ if test "$OSX_SW_VERS" != ""; then
+ OSX_VERSION=`sw_vers -productVersion | grep 10.[0-9]`
+ else
+ { echo "$as_me:$LINENO: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&5
+echo "$as_me: WARNING: Assuming OS X 10.4, use --with-macosx-version-min to override." >&2;}
+ OSX_VERSION="10.4"
+ fi
+
+ case "$OSX_VERSION" in
+ 10.4* )
+ wxUSE_MACOSX_VERSION_MIN=10.4
+ ;;
+
+ * )
+ if test "$wxUSE_OSX_CARBON" = 1; then
+ # otherwise configure stops on leopard for universal_binary
+ wxUSE_MACOSX_VERSION_MIN=10.4
+ else
+ # for Cocoa, use 10.5 to be able to compile it in 64 bits too
+ wxUSE_MACOSX_VERSION_MIN=10.5
+ fi
+ ;;
+ esac
+fi
+
+NEEDS_GCC40="no"
+if test "x$wxUSE_MACOSX_VERSION_MIN" == "x10.4"; then
+ NEEDS_GCC40="yes"
+fi
+
+if test "$wxUSE_OSX_CARBON" = 1; then
+ NEEDS_GCC40="yes"
+fi
+
+if test "x$NEEDS_GCC40" == "xyes"; then
+ # gcc 4.2 cannot compile 10.4 compatible code, so if the user is using it
+ # and wants 10.4 compatible code, then 'downgrade' to 4.0
+ # This is also the simplest way to get 32-bit binaries on Snow Leopard.
+ if test "x$CC" = "xgcc"; then
+ CCVERSION=`$CC --version | grep 4.[2-9].`
+ if test "x$CCVERSION" != "x"; then
+ echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead."
+ CC="/usr/bin/gcc-4.0"
+ fi
+ fi
+
+ if test "x$CXX" = "xg++"; then
+ CCVERSION=`$CXX --version | grep 4.[2-9].`
+ if test "x$CCVERSION" != "x"; then
+ CXX="/usr/bin/g++-4.0"
+ fi
fi
fi
if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then
- MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+ if test "$wxUSE_OSX_IPHONE" = 1; then
+ MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN"
+ else
+ MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN"
+ fi
eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\""
eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\""
eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\""
fi
-
+fi
case "${host}" in
*-*-darwin* )
_ACEOF
-if test "$ac_cv_sizeof_wchar_t" != 0; then
- wxUSE_WCHAR_T=yes
-else
- wxUSE_WCHAR_T=no
+if test "$ac_cv_sizeof_wchar_t" = 0; then
+ { { echo "$as_me:$LINENO: error: wxWidgets requires wchar_t support." >&5
+echo "$as_me: error: wxWidgets requires wchar_t support." >&2;}
+ { (exit 1); exit 1; }; }
fi
+cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WCHAR_T 1
+_ACEOF
+
{ echo "$as_me:$LINENO: checking for va_copy" >&5
echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
echo "${ECHO_T}$ac_cv_c_bigendian" >&6; }
if test $ac_cv_c_bigendian = unknown; then
- { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
-echo "$as_me: WARNING: Assuming little-endian target machine - this may be overriden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}
+ { echo "$as_me:$LINENO: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&5
+echo "$as_me: WARNING: Assuming little-endian target machine - this may be overridden by adding the line \"ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}\" to config.cache file" >&2;}
fi
if test $ac_cv_c_bigendian = yes; then
cat >>confdefs.h <<\_ACEOF
fi
if test "x$SGICC" = "xyes"; then
- CFLAGS="-woff 3970 $CFLAGS"
+ { echo "$as_me:$LINENO: checking if cc version is 7.4.4 or greater" >&5
+echo $ECHO_N "checking if cc version is 7.4.4 or greater... $ECHO_C" >&6; }
+if test "${wx_cv_prog_sgicc744+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 ()
+{
+
+ #if _SGI_COMPILER_VERSION >= 744
+ chock me: mipsPro is 7.4.4 or later
+ #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
+ wx_cv_prog_sgicc744=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_prog_sgicc744=yes
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_prog_sgicc744" >&5
+echo "${ECHO_T}$wx_cv_prog_sgicc744" >&6; }
+
+ if test "x$wx_cv_prog_sgicc744" = "xyes"; then
+ CFLAGS="-woff 3970 $CFLAGS"
+ fi
fi
if test "x$SGICXX" = "xyes"; then
- CXXFLAGS="-woff 3970 $CXXFLAGS"
+ { echo "$as_me:$LINENO: checking if CC version is 7.4.4 or greater" >&5
+echo $ECHO_N "checking if CC version is 7.4.4 or greater... $ECHO_C" >&6; }
+if test "${wx_cv_prog_sgicxx744+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 ()
+{
+
+ #if _SGI_COMPILER_VERSION >= 744
+ chock me: mipsPro is 7.4.4 or later
+ #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_prog_sgicxx744=no
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_prog_sgicxx744=yes
+
+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_prog_sgicxx744" >&5
+echo "${ECHO_T}$wx_cv_prog_sgicxx744" >&6; }
+
+ if test "x$wx_cv_prog_sgicxx744" = "xyes"; then
+ CXXFLAGS="-woff 3970 $CXXFLAGS"
+ fi
fi
if test "x$HPCC" = "xyes"; then
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_class_stdhashmapset=yes
+ wx_cv_class_stdhashmapset=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_class_stdhashmapset=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+fi
+
+
+
+ if test "$wx_cv_class_stdhashmapset" = yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_HASH_MAP 1
+_ACEOF
+
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_STD_HASH_MAP 1
+_ACEOF
+
+ fi
+
+ { 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
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+
+
+#include <ext/hash_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_ext_hash_map=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_header_ext_hash_map=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
+echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
+if test $ac_cv_header_ext_hash_map = yes; then
+ { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
+echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
+if test "${wx_cv_class_gnuhashmapset+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 <ext/hash_map>
+ #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;
+ ;
+ 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_gnuhashmapset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_class_stdhashmapset=no
+ wx_cv_class_gnuhashmapset=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_stdhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_stdhashmapset" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
+echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
fi
- if test "$wx_cv_class_stdhashmapset" = yes; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_HASH_MAP 1
+ fi
+ fi
+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
+{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
+if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ # Double quotes because CXXCPP needs to be expanded
+ for CXXCPP in "$CXX -E" "/lib/cpp"
+ do
+ ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STD_HASH_MAP 1
+ # Broken: fails on valid input.
+continue
+fi
+
+rm -f conftest.err conftest.$ac_ext
+
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ # Broken: success on invalid input.
+continue
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
- fi
+ # Passes both tests.
+ac_preproc_ok=:
+break
+fi
- { 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
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ break
+fi
+
+ done
+ ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+ CXXCPP=$ac_cv_prog_CXXCPP
else
+ ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
+echo "${ECHO_T}$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ # <limits.h> exists even on freestanding compilers.
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+ Syntax error
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ :
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.$ac_ext
-#include <ext/hash_map>
+ # OK, works on sane cases. Now check whether nonexistent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_header_ext_hash_map=yes
+ }; then
+ # Broken: success on invalid input.
+continue
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_ext_hash_map=no
+ # Passes both tests.
+ac_preproc_ok=:
+break
fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then
+ :
+else
+ { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&5
+echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ext_hash_map" >&5
-echo "${ECHO_T}$ac_cv_header_ext_hash_map" >&6; }
-if test $ac_cv_header_ext_hash_map = yes; then
- { echo "$as_me:$LINENO: checking for GNU hash_map and hash_set" >&5
-echo $ECHO_N "checking for GNU hash_map and hash_set... $ECHO_C" >&6; }
-if test "${wx_cv_class_gnuhashmapset+set}" = set; 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
+
+
+
+
+for ac_header in type_traits tr1/type_traits
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
else
- cat >conftest.$ac_ext <<_ACEOF
+ # Is the header compilable?
+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <ext/hash_map>
- #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;
- ;
- return 0;
-}
+$ac_includes_default
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_class_gnuhashmapset=yes
+ ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_class_gnuhashmapset=no
+ ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+# Is the header present?
+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_class_gnuhashmapset" >&5
-echo "${ECHO_T}$wx_cv_class_gnuhashmapset" >&6; }
+ ac_header_preproc=no
fi
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ----------------------------------------- ##
+## Report this to wx-dev@lists.wxwidgets.org ##
+## ----------------------------------------- ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
- fi
- fi
fi
+done
+
+
if test -n "$GCC"; then
/usr/local/include \
/usr/local/X11/include \
/usr/local/include/X11 \
+ /usr/local/X11R7/include \
/usr/local/X11R6/include \
+ /usr/local/include/X11R7 \
/usr/local/include/X11R6 \
\
/usr/Motif-2.1/include \
\
/usr/include/Xm \
\
+ /usr/X11R7/include \
/usr/X11R6/include \
/usr/X11R6.4/include \
\
+ /usr/include/X11R7 \
/usr/include/X11R6 \
\
/usr/X11/include \
if test -z "$x_includes" -o "$x_includes" = NONE; then
ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /usr/include;
+for ac_dir in $SEARCH_INCLUDE /usr/include
do
if test -f "$ac_dir/X11/Intrinsic.h"; then
ac_find_includes=$ac_dir
if test -z "$x_libraries" -o "$x_libraries" = NONE; then
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libXt.$ac_extension"; then
if test "$ac_cv_header_png_h" = "yes"; then
- { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
+ { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
#ifdef __cplusplus
extern "C"
#endif
-char png_check_sig ();
+char png_sig_cmp ();
int
main ()
{
-return png_check_sig ();
+return png_sig_cmp ();
;
return 0;
}
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- ac_cv_lib_png_png_check_sig=yes
+ ac_cv_lib_png_png_sig_cmp=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_lib_png_png_check_sig=no
+ ac_cv_lib_png_png_sig_cmp=no
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
-if test $ac_cv_lib_png_png_check_sig = yes; then
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
+if test $ac_cv_lib_png_png_sig_cmp = yes; then
PNG_LINK=" -lpng -lz"
fi
fi
-if test "$wxUSE_WCHAR_T" != "yes"; then
- if test "$wxUSE_EXPAT" != "no"; then
- { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&5
-echo "$as_me: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&2;}
- wxUSE_EXPAT=no
- fi
- if test "$wxUSE_XML" != "no"; then
- { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&5
-echo "$as_me: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&2;}
- wxUSE_XML=no
- fi
-fi
-
if test "$wxUSE_EXPAT" != "no"; then
wxUSE_XML=yes
cat >>confdefs.h <<\_ACEOF
- 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"
+ LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32"
+ case "${host}" in
+ x86_64-*-mingw32* )
+ WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
;;
esac
if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
LIBS="$LIBS -lkernel32 -luser32"
esac
- RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+ RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
- WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+ WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"
WIN32INSTALL=win32install
WXGTK2=
WXGPE=
- if test "$wxUSE_COCOA" = 1 ; then
+ if test "$wxUSE_OLD_COCOA" = 1 ; then
if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
{ echo "$as_me:$LINENO: WARNING: Printing not supported under wxCocoa yet, disabled" >&5
echo "$as_me: WARNING: Printing not supported under wxCocoa yet, disabled" >&2;}
rm -f conf.gtktest
- case "${host}" in
- *-*-solaris2* )
- if test "$wxUSE_SHARED" != "yes"; then
- GTK_LIBS="$GTK_LIBS -lX11"
- fi
- esac
+ GTK_LIBS="$GTK_LIBS -lX11"
fi
if test -z "$wx_cv_lib_gtk"; then
wx_cv_lib_gtk=none
else
wx_cv_cflags_gtk=$GTK_CFLAGS
- wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[^ ]*cairo[^ ]*//g'`
+ wx_cv_libs_gtk=$GTK_LIBS
fi
CFLAGS="$wx_cv_cflags_gtk $CFLAGS"
LIBS="$LIBS $wx_cv_libs_gtk"
- { 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; }
+ { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.18" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.18... $ECHO_C" >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
main ()
{
- #if !GTK_CHECK_VERSION(2,10,0)
- Not GTK+ 2.10
+ #if !GTK_CHECK_VERSION(2,18,0)
+ Not GTK+ 2.18
#endif
;
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+ cat >>confdefs.h <<\_ACEOF
+#define __WXGTK218__ 1
+_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define __WXGTK210__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- ac_wxgtk210=1
+ ac_wxgtk218=1
else
echo "$as_me: failed program was:" >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- ac_wxgtk210=0
+ ac_wxgtk218=0
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "$ac_wxgtk210" = 0; then
- { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
-echo $ECHO_N "checking if GTK+ is version >= 2.6... $ECHO_C" >&6; }
+ if test "$ac_wxgtk218" = 0; then
+ { 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
/* confdefs.h. */
_ACEOF
main ()
{
- #if !GTK_CHECK_VERSION(2,6,0)
- Not GTK+ 2.6
+ #if !GTK_CHECK_VERSION(2,10,0)
+ Not GTK+ 2.10
#endif
;
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
+ cat >>confdefs.h <<\_ACEOF
+#define __WXGTK210__ 1
+_ACEOF
+
cat >>confdefs.h <<\_ACEOF
#define __WXGTK26__ 1
_ACEOF
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- ac_wxgtk26=1
+ ac_wxgtk210=1
else
echo "$as_me: failed program was:" >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
- ac_wxgtk26=0
+ ac_wxgtk210=0
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+ if test "$ac_wxgtk210" = 0; then
+ { echo "$as_me:$LINENO: checking if GTK+ is version >= 2.6" >&5
+echo $ECHO_N "checking if GTK+ is version >= 2.6... $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,6,0)
+ Not GTK+ 2.6
+ #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 __WXGTK26__ 1
+_ACEOF
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ ac_wxgtk26=1
+
+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; }
+ ac_wxgtk26=0
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
fi
CFLAGS="$save_CFLAGS"
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
+ TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -DG_DISABLE_CAST_CHECKS"
+
AFMINSTALL=afminstall
TOOLKIT=GTK
GUIDIST=GTK_DIST
echo $ECHO_N "checking for gpewidget library... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libgpewidget.$ac_extension"; then
echo $ECHO_N "checking for Motif/Lesstif headers... $ECHO_C" >&6; }
ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /usr/include;
+for ac_dir in $SEARCH_INCLUDE /usr/include
do
if test -f "$ac_dir/Xm/Xm.h"; then
ac_find_includes=$ac_dir
echo $ECHO_N "checking for Motif/Lesstif library... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libXm.$ac_extension"; then
echo $ECHO_N "checking for Xpm library... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libXpm.$ac_extension"; then
fi
if test "x$wxUSE_UNIX" = "xyes"; then
- CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon $CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS_PASCAL -I/Developer/Headers/FlatCarbon $CPPFLAGS"
else
- CPPFLAGS="$CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON $CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS_PASCAL -DTARGET_CARBON $CPPFLAGS"
fi
TOOLKIT=OSX_CARBON
GUIDIST=OSX_CARBON_DIST
WXBASEPORT="_carbon"
+
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi
if test "$wxUSE_OSX_COCOA" = 1; then
TOOLKIT=OSX_COCOA
GUIDIST=OSX_COCOA_DIST
+
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMAC__ -D__WXOSX__"
fi
- if test "$wxUSE_COCOA" = 1; then
+ if test "$wxUSE_OSX_IPHONE" = 1; then
+ TOOLKIT=OSX_IPHONE
+ fi
+
+ if test "$wxUSE_OLD_COCOA" = 1; then
TOOLKIT=COCOA
GUIDIST=COCOA_DIST
fi
+USE_XINERAMA=0
if test "$wxUSE_DISPLAY" = "yes"; then
- if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+ if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then
{ echo "$as_me:$LINENO: checking for Xinerama" >&5
echo $ECHO_N "checking for Xinerama... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libXinerama.$ac_extension"; then
if test "$ac_path_to_link" != " -L/usr/lib" ; then
LDFLAGS="$LDFLAGS $ac_path_to_link"
fi
+ USE_XINERAMA=1
GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
-
- { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
-echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
-
- ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
- do
- for ac_extension in a so sl dylib dll.a; do
- if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
- ac_find_libraries=$ac_dir
- break 2
- fi
- done
- done
-
- if test "$ac_find_libraries" != "" ; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-for ac_header in X11/extensions/xf86vmode.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5
+echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;}
+ wxUSE_DISPLAY="no"
+ fi
+ elif test "$wxUSE_MSW" = 1; then
+ { echo "$as_me:$LINENO: checking for ddraw.h" >&5
+echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_ddraw_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <windows.h>
- #if HAVE_X11_XLIB_H
- #include <X11/Xlib.h>
- #endif
-
-
-#include <$ac_header>
+#include <ddraw.h>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- eval "$as_ac_Header=yes"
+ ac_cv_header_ddraw_h=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- eval "$as_ac_Header=no"
+ ac_cv_header_ddraw_h=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5
+echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; }
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+ fi
fi
-done
+if test "$wxUSE_DISPLAY" = "yes"; then
+ if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then
+ { echo "$as_me:$LINENO: checking for Xxf86vm extension" >&5
+echo $ECHO_N "checking for Xxf86vm extension... $ECHO_C" >&6; }
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- fi
+ ac_find_libraries=
+ for ac_dir in $SEARCH_LIB
+ do
+ for ac_extension in a so sl dylib dll.a; do
+ if test -f "$ac_dir/libXxf86vm.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+ done
+ done
- else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: WARNING: Xinerama not found; disabling wxDisplay" >&5
-echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;}
- wxUSE_DISPLAY="no"
- fi
- elif test "$wxUSE_MSW" = 1; then
- { echo "$as_me:$LINENO: checking for ddraw.h" >&5
-echo $ECHO_N "checking for ddraw.h... $ECHO_C" >&6; }
-if test "${ac_cv_header_ddraw_h+set}" = set; then
+ if test "$ac_find_libraries" != "" ; then
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+for ac_header in X11/extensions/xf86vmode.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <windows.h>
-#include <ddraw.h>
+ #if HAVE_X11_XLIB_H
+ #include <X11/Xlib.h>
+ #endif
+
+
+#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- ac_cv_header_ddraw_h=yes
+ eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_header_ddraw_h=no
+ eval "$as_ac_Header=no"
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_ddraw_h" >&5
-echo "${ECHO_T}$ac_cv_header_ddraw_h" >&6; }
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+
+fi
+done
+ else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
fi
fi
if test "$wxUSE_DETECT_SM" = "yes"; then
- if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then
{ echo "$as_me:$LINENO: checking for -lSM - X11 session management" >&5
echo $ECHO_N "checking for -lSM - X11 session management... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libSM.$ac_extension"; 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
+ if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
echo $ECHO_N "checking for OpenGL headers... $ECHO_C" >&6; }
ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include;
+for ac_dir in $SEARCH_INCLUDE /opt/graphics/OpenGL/include /usr/include
do
if test -f "$ac_dir/GL/gl.h"; then
ac_find_includes=$ac_dir
echo $ECHO_N "checking for -lGL... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib;
+ for ac_dir in $SEARCH_LIB /opt/graphics/OpenGL/lib
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libGL.$ac_extension"; then
echo $ECHO_N "checking for -lGLU... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libGLU.$ac_extension"; then
echo $ECHO_N "checking for -lMesaGL... $ECHO_C" >&6; }
ac_find_libraries=
- for ac_dir in $SEARCH_LIB;
+ for ac_dir in $SEARCH_LIB
do
for ac_extension in a so sl dylib dll.a; do
if test -f "$ac_dir/libMesaGL.$ac_extension"; then
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
wxUSE_OPENGL="no"
fi
+ if test "$wxUSE_OPENGL" = "auto"; then
+ wxUSE_OPENGL=yes
+ fi
+
if test "$wxUSE_OPENGL" = "yes"; then
USE_OPENGL=1
cat >>confdefs.h <<\_ACEOF
;;
*-*-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"
if test $wxUSE_RPATH = "no"; then
SAMPLES_RPATH_FLAG=''
- SAMPLES_RPATH_POSTLINK=''
+ DYLIB_PATH_POSTLINK=''
WXCONFIG_RPATH=''
fi
UNICODE=1
fi
-lib_debug_suffix=
-WX_DEBUGTYPE="release"
-DEBUG_FLAG=0
-if test "$wxUSE_DEBUG_FLAG" = "yes"; then
- lib_debug_suffix=d
- WX_DEBUGTYPE="debug"
- DEBUG_FLAG=1
-fi
-
WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR}
WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'`
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}${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}${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}${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
-
-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}"
+if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
+ WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
else
- WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+ WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_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}"
+ WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
else
- WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}"
fi
-if test "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_OLD_COCOA" = 1; then
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
fi
-if test "$wxUSE_WCHAR_T" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WCHAR_T 1
-_ACEOF
-
-
- WCSLEN_FOUND=0
- WCHAR_LINK=
+WCSLEN_FOUND=0
+WCHAR_LINK=
for ac_func in wcslen
do
done
- if test "$WCSLEN_FOUND" = 0; then
- if test "$TOOLKIT" = "MSW"; then
- { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5
+if test "$WCSLEN_FOUND" = 0; then
+ if test "$TOOLKIT" = "MSW"; then
+ { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5
echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; }
if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
WCHAR_OK=1
fi
- else
- { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5
+ else
+ { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5
echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; }
if test "${ac_cv_lib_w_wcslen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; }
if test $ac_cv_lib_w_wcslen = yes; then
- WCHAR_LINK=" -lw"
- WCSLEN_FOUND=1
+ WCHAR_LINK=" -lw"
+ WCSLEN_FOUND=1
fi
- fi
fi
+fi
- if test "$WCSLEN_FOUND" = 1; then
- cat >>confdefs.h <<\_ACEOF
+if test "$WCSLEN_FOUND" = 1; then
+ cat >>confdefs.h <<\_ACEOF
#define HAVE_WCSLEN 1
_ACEOF
- fi
+fi
-for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp
+
+for ac_func in wcsdup wcsftime 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
done
- if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
- CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
- fi
+if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
+ CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
+fi
- { echo "$as_me:$LINENO: checking for mbstate_t" >&5
+{ echo "$as_me:$LINENO: checking for mbstate_t" >&5
echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
if test "${ac_cv_type_mbstate_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
fi
-else
- { echo "$as_me:$LINENO: WARNING: Wide character support is unavailable" >&5
-echo "$as_me: WARNING: Wide character support is unavailable" >&2;}
-fi
fi
;;
+ *-*-qnx*)
+ THREAD_OPTS=""
+ ;;
+
*-*-*UnixWare*)
if test "x$GCC" != "xyes"; then
THREAD_OPTS="-Ethread"
;;
esac
- THREAD_OPTS="$THREAD_OPTS pthread none"
+ case "${host}" in
+ *-*-qnx*)
+ THREAD_OPTS="none pthread"
+ ;;
+
+ *)
+ THREAD_OPTS="$THREAD_OPTS pthread none"
+ ;;
+ esac
THREADS_OK=no
for flag in $THREAD_OPTS; do
{ echo "$as_me:$LINENO: WARNING: No thread support on this system... disabled" >&5
echo "$as_me: WARNING: No thread support on this system... disabled" >&2;}
else
- LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+ LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+ WXCONFIG_LDFLAGS="$THREADS_CFLAGS $WXCONFIG_LDFLAGS"
LIBS="$THREADS_LINK $LIBS"
{ echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
case "${host}" in
*-aix*)
LDFLAGS="-L/usr/lib/threads $LDFLAGS"
+ WXCONFIG_LDFLAGS="-L/usr/lib/threads $WXCONFIG_LDFLAGS"
flag="-D_THREAD_SAFE"
;;
*-freebsd*)
fi
fi
- { echo "$as_me:$LINENO: checking for __thread keyword" >&5
+ if test "$wxUSE_COMPILER_TLS" = "auto"; then
+ if test "$USE_NETBSD" = 1; then
+ { echo "$as_me:$LINENO: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&5
+echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if it works now" >&2;}
+ wxUSE_COMPILER_TLS=no
+ else
+ wxUSE_COMPILER_TLS=yes
+ fi
+ fi
+
+ if test "$wxUSE_COMPILER_TLS" = "yes"; then
+ { 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
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
main ()
{
- static __thread int n = 0;
- static __thread int *p = 0;
+ static __thread int n = 0;
+ static __thread int *p = 0;
;
return 0;
{ 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
+ if test "$wx_cv_cc___thread" = "yes"; then
GXX_VERSION=""
- if test -n "$ax_cv_gxx_version"; then
- { echo "$as_me:$LINENO: checking whether __thread support in g++ is usable" >&5
+ 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
+ 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
+ wx_cv_cc___thread=no
+ ;;
+ *)
+ { echo "$as_me:$LINENO: result: yes, it works" >&5
echo "${ECHO_T}yes, it works" >&6; }
- ;;
- esac
+ ;;
+ esac
+ fi
fi
- fi
- if test "$wx_cv_cc___thread" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
+ if test "$wx_cv_cc___thread" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
#define HAVE___THREAD_KEYWORD 1
_ACEOF
- fi
+ fi
+ fi
fi
else
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"
fi
fi
fi
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
- cat >>confdefs.h <<\_ACEOF
-#define WXDEBUG 1
-_ACEOF
+if test "$wxUSE_DEBUG_FLAG" = "no" ; then
+ WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
- WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__"
-else
if test "$wxUSE_GTK" = 1 ; then
if test "x$wxGTK_VERSION" = "x1" ; then
CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
if test "$GCC" = "yes" ; then
if test "$wxUSE_NO_RTTI" = "yes" ; then
- WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-rtti"
+ WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -DwxNO_RTTI -fno-rtti"
fi
if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
WXCONFIG_CXXFLAGS="$WXCONFIG_CXXFLAGS -fno-exceptions"
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
fi
+if test "$wxUSE_FSWATCHER" = "yes"; then
+ if test "$wxUSE_MSW" != "1"; then
+ if test "$wxUSE_UNIX" = "yes"; then
+
+for ac_header in sys/inotify.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ if test "$ac_cv_header_sys_inotify_h" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxHAS_INOTIFY 1
+_ACEOF
+
+ else
+
+for ac_header in sys/event.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_Header=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_Header'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+ if test "$ac_cv_header_sys_event_h" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxHAS_KQUEUE 1
+_ACEOF
+
+ else
+ wxUSE_FSWATCHER=no
+ fi
+ fi
+ else
+ wxUSE_FSWATCHER=no
+ fi
+ fi
+
+ if test "$wxUSE_FSWATCHER" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FSWATCHER 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher"
+ else
+ { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher won't be available on this platform" >&5
+echo "$as_me: WARNING: wxFileSystemWatcher won't be available on this platform" >&2;}
+ fi
+fi
+
+
if test "$wxUSE_STL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STL 1
fi
+if test "$wxUSE_ANY" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ANY 1
+_ACEOF
+
+fi
+
if test "$wxUSE_APPLE_IEEE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_APPLE_IEEE 1
{ echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
wxUSE_LIBHILDON="no"
+ ac_hildon_lgpl=0
elif test $pkg_failed = untried; then
{ echo "$as_me:$LINENO: WARNING: libhildon_lgpl not found" >&5
echo "$as_me: WARNING: libhildon_lgpl not found" >&2;}
wxUSE_LIBHILDON="no"
+ ac_hildon_lgpl=0
else
#define wxUSE_LIBHILDON 1
_ACEOF
+ ac_hildon_lgpl=1
+
+fi
+
+ if test "$ac_hildon_lgpl" = 0 ; then
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for HILDON2" >&5
+echo $ECHO_N "checking for HILDON2... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$HILDON2_CFLAGS"; then
+ pkg_cv_HILDON2_CFLAGS="$HILDON2_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_HILDON2_CFLAGS=`$PKG_CONFIG --cflags "hildon-1 >= 1.99" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$HILDON2_LIBS"; then
+ pkg_cv_HILDON2_LIBS="$HILDON2_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hildon-1 >= 1.99\"") >&5
+ ($PKG_CONFIG --exists --print-errors "hildon-1 >= 1.99") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_HILDON2_LIBS=`$PKG_CONFIG --libs "hildon-1 >= 1.99" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ HILDON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+ else
+ HILDON2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "hildon-1 >= 1.99"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$HILDON2_PKG_ERRORS" >&5
+
+
+ { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5
+echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+ wxUSE_LIBHILDON2="no"
+
+
+elif test $pkg_failed = untried; then
+
+ { echo "$as_me:$LINENO: WARNING: libhildon_1 not found" >&5
+echo "$as_me: WARNING: libhildon_1 not found" >&2;}
+ wxUSE_LIBHILDON2="no"
+
+
+else
+ HILDON2_CFLAGS=$pkg_cv_HILDON2_CFLAGS
+ HILDON2_LIBS=$pkg_cv_HILDON2_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+ EXTRALIBS_HILDON="$HILDON2_LIBS"
+ CFLAGS="$CFLAGS $HILDON2_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS"
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_LIBHILDON2 1
+_ACEOF
+
fi
+ fi
fi
fi
fi
fi
+if test "$wxUSE_FILE_HISTORY" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_FILE_HISTORY 1
+_ACEOF
+
+fi
+
if test "$wxUSE_FILESYSTEM" = "yes"; then
if test "$wxUSE_STREAMS" != yes -o \( "$wxUSE_FILE" != yes -a "$wxUSE_FFILE" != yes \); then
{ echo "$as_me:$LINENO: WARNING: wxFileSystem requires wxStreams and wxFile or wxFFile... disabled" >&5
fi
+if test "$wxUSE_STD_CONTAINERS" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STD_CONTAINERS 1
+_ACEOF
+
+fi
+
if test "$wxUSE_STD_IOSTREAM" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STD_IOSTREAM 1
fi
+if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_STD_STRING_CONV_IN_WXSTRING 1
+_ACEOF
+
+fi
+
if test "$wxUSE_STDPATHS" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_STDPATHS 1
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_func_gettimeofday_has_2_args=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
- #include <sys/time.h>
- #include <unistd.h>
-
-int
-main ()
-{
-
- struct timeval tv;
- gettimeofday(&tv);
-
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- wx_cv_func_gettimeofday_has_2_args=no
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
- { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
-echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
- wx_cv_func_gettimeofday_has_2_args=unknown
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
-echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
-
- if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define WX_GETTIMEOFDAY_NO_TZ 1
-_ACEOF
-
- fi
-fi
-
-if test "$wxUSE_DATETIME" = "yes"; then
- { echo "$as_me:$LINENO: checking for strptime" >&5
-echo $ECHO_N "checking for strptime... $ECHO_C" >&6; }
-if test "${ac_cv_func_strptime+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define strptime to an innocuous variant, in case <limits.h> declares strptime.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define strptime innocuous_strptime
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char strptime (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strptime
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strptime ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined __stub_strptime || defined __stub___strptime
-choke me
-#endif
-
-int
-main ()
-{
-return strptime ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_func_strptime=yes
+ wx_cv_func_gettimeofday_has_2_args=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- ac_cv_func_strptime=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_strptime" >&5
-echo "${ECHO_T}$ac_cv_func_strptime" >&6; }
-
- if test "$ac_cv_func_strptime" = "yes"; then
- { echo "$as_me:$LINENO: checking for strptime declaration" >&5
-echo $ECHO_N "checking for strptime declaration... $ECHO_C" >&6; }
-if test "${wx_cv_func_strptime_decl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
- cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
- #include <time.h>
+ #include <sys/time.h>
+ #include <unistd.h>
int
main ()
{
- struct tm t;
- strptime("foo", "bar", &t);
+ struct timeval tv;
+ gettimeofday(&tv);
;
return 0;
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
+ test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
- wx_cv_func_strptime_decl=yes
+ wx_cv_func_gettimeofday_has_2_args=no
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
- wx_cv_func_strptime_decl=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
+ { echo "$as_me:$LINENO: WARNING: failed to determine number of gettimeofday() arguments" >&5
+echo "$as_me: WARNING: failed to determine number of gettimeofday() arguments" >&2;}
+ wx_cv_func_gettimeofday_has_2_args=unknown
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_decl" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_decl" >&6; }
- fi
- if test "$wx_cv_func_strptime_decl" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME_DECL 1
-_ACEOF
- else
- wx_strptime_decl="extern char *strptime(const char *, const char *, struct tm *);"
- fi
- if test "$ac_cv_func_strptime" = "yes"; then
- { echo "$as_me:$LINENO: checking whether strptime() fails on invalid strings" >&5
-echo $ECHO_N "checking whether strptime() fails on invalid strings... $ECHO_C" >&6; }
-if test "${wx_cv_func_strptime_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- wx_cv_func_strptime_ok=no
-
-else
- cat >conftest.$ac_ext <<_ACEOF
-
- #include <stdlib.h>
- #include <time.h>
- #include "confdefs.h"
-
- $wx_strptime_decl
-
- int main()
- {
- struct tm t;
- return !!strptime("", "%x", &t);
- }
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- wx_cv_func_strptime_ok=yes
-else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-( exit $ac_status )
-wx_cv_func_strptime_ok=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $wx_cv_func_strptime_ok" >&5
-echo "${ECHO_T}$wx_cv_func_strptime_ok" >&6; }
+{ echo "$as_me:$LINENO: result: $wx_cv_func_gettimeofday_has_2_args" >&5
+echo "${ECHO_T}$wx_cv_func_gettimeofday_has_2_args" >&6; }
- if test "$wx_cv_func_strptime_ok" = "yes"; then
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRPTIME 1
+ if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
_ACEOF
- fi
fi
+fi
+if test "$wxUSE_DATETIME" = "yes"; then
{ echo "$as_me:$LINENO: checking for timezone variable in <time.h>" >&5
echo $ECHO_N "checking for timezone variable in <time.h>... $ECHO_C" >&6; }
if test "${wx_cv_var_timezone+set}" = set; then
fi
+if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_UIACTIONSIMULATOR 1
+_ACEOF
+
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
+fi
+
USES_CONTROLS=0
if test "$wxUSE_CONTROLS" = "yes"; then
USES_CONTROLS=1
fi
+if test "$wxUSE_MARKUP" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_MARKUP 1
+_ACEOF
+
+fi
+
if test "$wxUSE_ACCEL" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_ACCEL 1
USES_CONTROLS=1
fi
+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_COMMANDLINKBUTTON 1
+_ACEOF
+
+ USES_CONTROLS=1
+fi
+
if test "$wxUSE_CHOICE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_CHOICE 1
fi
+if test "$wxUSE_INFOBAR" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_INFOBAR 1
+_ACEOF
+
+fi
+
if test "$wxUSE_LISTBOOK" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_LISTBOOK 1
_ACEOF
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS editlbox"
fi
if test "$wxUSE_NOTEBOOK" = "yes"; then
fi
+if test "$wxUSE_RICHMSGDLG" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHMSGDLG 1
+_ACEOF
+
+fi
+
if test "$wxUSE_SASH" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_SASH 1
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_COCOA" = 1 ; then
+ if test "$wxUSE_OLD_COCOA" = 1 ; then
{ echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5
echo "$as_me: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&2;}
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
- if test "$wxUSE_COCOA" = 1 ; then
+ if test "$wxUSE_OLD_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
fi
if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1 -o "$wxUSE_MGL" = 1; then
{ echo "$as_me:$LINENO: WARNING: Dialup manager not supported on this platform... disabled" >&5
echo "$as_me: WARNING: Dialup manager not supported on this platform... disabled" >&2;}
else
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
fi
+if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ARTPROVIDER_STD 1
+_ACEOF
+
+fi
+
+if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then
+ if test "$wxUSE_GTK" != 1; then
+ if test "$wxUSE_LIBPNG" != no -a \
+ "$wxUSE_IMAGE" = yes -a \
+ "$wxUSE_STREAMS" = yes; then
+ wxUSE_ARTPROVIDER_TANGO="yes"
+ fi
+ fi
+fi
+
+if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_ARTPROVIDER_TANGO 1
+_ACEOF
+
+fi
+
if test "$wxUSE_DRAGIMAGE" = "yes"; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_DRAGIMAGE 1
CPPFLAGS="$old_CPPFLAGS"
- elif test "$wxUSE_COCOA" = 1; then
+ elif test "$wxUSE_OLD_COCOA" = 1; then
cat >>confdefs.h <<\_ACEOF
#define wxUSE_WEBKIT 1
_ACEOF
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS propgrid"
fi
+USE_RIBBON=0
+if test "$wxUSE_RIBBON" = "yes"; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RIBBON 1
+_ACEOF
+
+ USE_RIBBON=1
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ribbon"
+fi
+
USE_STC=0
if test "$wxUSE_STC" = "yes"; then
cat >>confdefs.h <<\_ACEOF
USE_STC=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS stc"
+
+ # Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PYTHON+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PYTHON in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+ { echo "$as_me:$LINENO: result: $PYTHON" >&5
+echo "${ECHO_T}$PYTHON" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+ if test "x$PYTHON" = "x"; then
+ COND_PYTHON="#"
+ fi
+
fi
if test "$wxUSE_MENUS" = "yes"; then
if test "$wxUSE_MAC" = 1; then
- wxUSE_GRAPHICS_CONTEXT="yes"
+ wxUSE_GRAPHICS_CONTEXT="yes"
fi
if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then
- if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+ wx_has_graphics=0
+ if test "$wxUSE_MSW" = 1; then
+ { echo "$as_me:$LINENO: checking if GDI+ is available" >&5
+echo $ECHO_N "checking if GDI+ is available... $ECHO_C" >&6; }
+if test "${wx_cv_lib_gdiplus+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 <windows.h>
+ #include <gdiplus.h>
+int
+main ()
+{
- elif test "$wxUSE_GTK" != 1; then
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+ using namespace Gdiplus;
+
+ ;
+ 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_lib_gdiplus=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ wx_cv_lib_gdiplus=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
- else
+
+
+fi
+{ echo "$as_me:$LINENO: result: $wx_cv_lib_gdiplus" >&5
+echo "${ECHO_T}$wx_cv_lib_gdiplus" >&6; }
+ if test "$wx_cv_lib_gdiplus" = "yes"; then
+ wx_has_graphics=1
+ fi
+ elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
pkg_failed=no
{ echo "$as_me:$LINENO: checking for CAIRO" >&5
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
- { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5
-echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;}
+ { echo "$as_me:$LINENO: WARNING: Cairo library not found" >&5
+echo "$as_me: WARNING: Cairo library not found" >&2;}
elif test $pkg_failed = untried; then
- { echo "$as_me:$LINENO: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&5
-echo "$as_me: WARNING: Cairo library not found, unable to set wxUSE_GRAPHICS_CONTEXT" >&2;}
+ { echo "$as_me:$LINENO: WARNING: Cairo library not found" >&5
+echo "$as_me: WARNING: Cairo library not found" >&2;}
else
CAIRO_CFLAGS=$pkg_cv_CAIRO_CFLAGS
CAIRO_LIBS=$pkg_cv_CAIRO_LIBS
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
-#define wxUSE_GRAPHICS_CONTEXT 1
+ wx_has_graphics=1
+fi
+ if test "$wx_has_graphics" = 1; then
+ save_LIBS="$LIBS"
+ LIBS="$LIBS $CAIRO_LIBS"
+
+for ac_func in cairo_push_group
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+ eval "$as_ac_var=no"
fi
- fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+ LIBS="$save_LIBS"
+ if test "$ac_cv_func_cairo_push_group" = "no"; then
+ wx_has_graphics=0
+ { echo "$as_me:$LINENO: WARNING: Cairo library is too old and misses cairo_push_group()" >&5
+echo "$as_me: WARNING: Cairo library is too old and misses cairo_push_group()" >&2;}
+ else
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CAIRO 1
+_ACEOF
+
+
+ if test "$wxUSE_GTK" != 1; then
+ CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
+ fi
+ fi
+ fi
+ else
+ wx_has_graphics=1
+ fi
+
+ if test "$wx_has_graphics" = 1; then
+ cat >>confdefs.h <<\_ACEOF
+#define wxUSE_GRAPHICS_CONTEXT 1
+_ACEOF
+
+ else
+ { echo "$as_me:$LINENO: WARNING: wxGraphicsContext won't be available" >&5
+echo "$as_me: WARNING: wxGraphicsContext won't be available" >&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_PROPGRID" = "yes" ; then
BUILT_WX_LIBS="propgrid $BUILT_WX_LIBS"
fi
+ if test "$wxUSE_RIBBON" = "yes" ; then
+ BUILT_WX_LIBS="ribbon $BUILT_WX_LIBS"
+ fi
if test "$wxUSE_RICHTEXT" = "yes" ; then
BUILT_WX_LIBS="richtext $BUILT_WX_LIBS"
fi
-
+EXTRA_FRAMEWORKS=
if test "$wxUSE_MAC" = 1 ; then
- if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
- if test "$USE_DARWIN" = 1; then
- LDFLAGS="$LDFLAGS -framework QuickTime"
- fi
- fi
if test "$USE_DARWIN" = 1; then
- LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL"
+ if test "$wxUSE_OSX_IPHONE" = 1; then
+ EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore"
+ else
+ EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime"
+ fi
fi
fi
-if test "$wxUSE_COCOA" = 1 ; then
- LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
+if test "$wxUSE_OLD_COCOA" = 1 ; then
+ EXTRA_FRAMEWORKS="-framework IOKit -framework Cocoa"
if test "$wxUSE_MEDIACTRL" = "yes"; then
- LDFLAGS="$LDFLAGS -framework QuickTime"
+ EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework QuickTime"
fi
fi
-if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
- LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1 ; then
+ EXTRA_FRAMEWORKS="$EXTRA_FRAMEWORKS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
fi
+LDFLAGS="$LDFLAGS $EXTRA_FRAMEWORKS"
+WXCONFIG_LDFLAGS="$WXCONFIG_LDFLAGS $EXTRA_FRAMEWORKS"
+
LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
if test "$wxUSE_GUI" = "yes"; 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"
if test "$TOOLKIT" = "MSW"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
if test "$wxUSE_UNIVERSAL" != "yes"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg dll"
fi
fi
if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
;;
esac
+
+ if test "$wxUSE_MAC" = 1 ; then
+ CXXWARNINGS="$CXXWARNINGS -Wno-deprecated-declarations"
+ fi
fi
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}"
+EXTRALIBS_STC="-lwxscintilla${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`
fi
fi
for i in $wxconfig_3rdparty ; do
- WXCONFIG_LIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
+ WXCONFIG_LIBS="-lwx${i}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_LIBS"
done
+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
if test "$wxUSE_LIBHILDON" = "yes"; then
TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
fi
+ if test "$wxUSE_LIBHILDON2" = "yes"; then
+ TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon"
+ fi
if test "$TOOLKIT_EXTRA" != ""; then
TOOLKIT_DESC="$TOOLKIT_DESC with support for `echo $TOOLKIT_EXTRA | tr -s ' '`"
PLATFORM_BEOS=1
;;
* )
- ;;
+ { { echo "$as_me:$LINENO: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&5
+echo "$as_me: error: Unknown platform: $BAKEFILE_FORCE_PLATFORM" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
esac
fi
chmod +x shared-ld-sh
SHARED_LD_MODULE_CC="`pwd`/shared-ld-sh -bundle -headerpad_max_install_names -o"
- SHARED_LD_MODULE_CXX="CXX=\$(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
USE_SOVERLINUX=0
USE_SOVERSOLARIS=0
USE_SOVERCYGWIN=0
- USE_SOSYMLINKS=0
+ USE_SOTWOSYMLINKS=0
USE_MACVERSION=0
SONAME_FLAG=
fi
USE_SOVERSION=1
USE_SOVERLINUX=1
- USE_SOSYMLINKS=1
+ USE_SOTWOSYMLINKS=1
;;
*-*-solaris2* )
SONAME_FLAG="-h "
USE_SOVERSION=1
USE_SOVERSOLARIS=1
- USE_SOSYMLINKS=1
;;
*-*-darwin* )
USE_MACVERSION=1
USE_SOVERSION=1
- USE_SOSYMLINKS=1
+ USE_SOTWOSYMLINKS=1
;;
*-*-cygwin* )
- BAKEFILE_BAKEFILE_M4_VERSION="0.2.5"
+ BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
-BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.5"
+BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.9"
COND_BUILD_release_UNICODE_1=""
fi
+ COND_DEBUG_FLAG_0="#"
+ if test "x$DEBUG_FLAG" = "x0" ; then
+ COND_DEBUG_FLAG_0=""
+ fi
+
COND_DEBUG_FLAG_1="#"
if test "x$DEBUG_FLAG" = "x1" ; then
COND_DEBUG_FLAG_1=""
COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1=""
fi
+ COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_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_PROPGRID_1=""
fi
+ COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_RIBBON" = "x1" ; then
+ COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_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_QA_1=""
fi
+ COND_MONOLITHIC_0_USE_RIBBON_1="#"
+ if test "x$MONOLITHIC" = "x0" -a "x$USE_RIBBON" = "x1" ; then
+ COND_MONOLITHIC_0_USE_RIBBON_1=""
+ fi
+
COND_MONOLITHIC_0_USE_RICHTEXT_1="#"
if test "x$MONOLITHIC" = "x0" -a "x$USE_RICHTEXT" = "x1" ; then
COND_MONOLITHIC_0_USE_RICHTEXT_1=""
COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0=""
fi
+ COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0=""
+ fi
+
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=""
COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0=""
fi
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
+ fi
+
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
+ if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
+ fi
+
COND_PLATFORM_MACOSX_1_USE_GUI_1="#"
if test "x$PLATFORM_MACOSX" = "x1" -a "x$USE_GUI" = "x1" ; then
COND_PLATFORM_MACOSX_1_USE_GUI_1=""
COND_PLATFORM_WIN32_1=""
fi
+ COND_PLATFORM_WIN32_1_SHARED_0="#"
+ if test "x$PLATFORM_WIN32" = "x1" -a "x$SHARED" = "x0" ; then
+ COND_PLATFORM_WIN32_1_SHARED_0=""
+ fi
+
COND_SHARED_0="#"
if test "x$SHARED" = "x0" ; then
COND_SHARED_0=""
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=""
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_OSX_IPHONE_USE_GUI_1="#"
+ if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" ; then
+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1=""
+ fi
+
+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0="#"
+ if test "x$TOOLKIT" = "xOSX_IPHONE" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then
+ COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0=""
+ fi
+
COND_TOOLKIT_PM="#"
if test "x$TOOLKIT" = "xPM" ; then
COND_TOOLKIT_PM=""
COND_UNICODE_1=""
fi
+ COND_USE_CAIRO_1="#"
+ if test "x$USE_CAIRO" = "x1" ; then
+ COND_USE_CAIRO_1=""
+ fi
+
COND_USE_EXCEPTIONS_0="#"
if test "x$USE_EXCEPTIONS" = "x0" ; then
COND_USE_EXCEPTIONS_0=""
COND_USE_RTTI_1=""
fi
- COND_USE_SOSYMLINKS_1="#"
- if test "x$USE_SOSYMLINKS" = "x1" ; then
- COND_USE_SOSYMLINKS_1=""
+ COND_USE_SOTWOSYMLINKS_1="#"
+ if test "x$USE_SOTWOSYMLINKS" = "x1" ; then
+ COND_USE_SOTWOSYMLINKS_1=""
fi
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1="#"
COND_USE_SOVERSION_0=""
fi
+ COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1="#"
+ if test "x$USE_SOVERSION" = "x1" -a "x$USE_SOVERSOLARIS" = "x1" ; then
+ COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1=""
+ fi
+
COND_USE_SOVERSOLARIS_1="#"
if test "x$USE_SOVERSOLARIS" = "x1" ; then
COND_USE_SOVERSOLARIS_1=""
RESCOMP="$WINDRES"
fi
-if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
if test "$USE_WIN32" = 1; then
- ac_config_commands="$ac_config_commands
- rcdefs.h
- "
+ ac_config_commands="$ac_config_commands rcdefs.h"
fi
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wxWidgets $as_me 2.9.0, which was
+This file was extended by wxWidgets $as_me 2.9.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wxWidgets config.status 2.9.0
+wxWidgets config.status 2.9.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
AR!$AR$ac_delim
+OSX_SW_VERS!$OSX_SW_VERS$ac_delim
+CXXCPP!$CXXCPP$ac_delim
subdirs!$subdirs$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
GTK_CFLAGS!$GTK_CFLAGS$ac_delim
GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim
HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim
HILDON_LIBS!$HILDON_LIBS$ac_delim
-CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim
-CAIRO_LIBS!$CAIRO_LIBS$ac_delim
-GST_CFLAGS!$GST_CFLAGS$ac_delim
-GST_LIBS!$GST_LIBS$ac_delim
+HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim
+HILDON2_LIBS!$HILDON2_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
+PYTHON!$PYTHON$ac_delim
+COND_PYTHON!$COND_PYTHON$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
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_GNOMEVFS!$EXTRALIBS_GNOMEVFS$ac_delim
EXTRALIBS_HILDON!$EXTRALIBS_HILDON$ac_delim
UNICODE!$UNICODE$ac_delim
-BUILD!$BUILD$ac_delim
DEBUG_INFO!$DEBUG_INFO$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
USE_SOVERSOLARIS!$USE_SOVERSOLARIS$ac_delim
USE_SOVERCYGWIN!$USE_SOVERCYGWIN$ac_delim
USE_MACVERSION!$USE_MACVERSION$ac_delim
-USE_SOSYMLINKS!$USE_SOSYMLINKS$ac_delim
+USE_SOTWOSYMLINKS!$USE_SOTWOSYMLINKS$ac_delim
SONAME_FLAG!$SONAME_FLAG$ac_delim
DEPS_TRACKING!$DEPS_TRACKING$ac_delim
BK_DEPS!$BK_DEPS$ac_delim
WINDRES!$WINDRES$ac_delim
REZ!$REZ$ac_delim
SETFILE!$SETFILE$ac_delim
-OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
-GCC_PCH!$GCC_PCH$ac_delim
-ICC_PCH!$ICC_PCH$ac_delim
-ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
-ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$ac_delim
-BK_MAKE_PCH!$BK_MAKE_PCH$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
+OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim
+GCC_PCH!$GCC_PCH$ac_delim
+ICC_PCH!$ICC_PCH$ac_delim
+ICC_PCH_CREATE_SWITCH!$ICC_PCH_CREATE_SWITCH$ac_delim
+ICC_PCH_USE_SWITCH!$ICC_PCH_USE_SWITCH$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
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_0!$COND_DEBUG_FLAG_0$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_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_RIBBON_1!$COND_MONOLITHIC_0_SHARED_0_USE_RIBBON_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_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_RIBBON_1!$COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_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_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_RIBBON_1!$COND_MONOLITHIC_0_USE_RIBBON_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_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_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_PLATFORM_MSDOS_0!$COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0$ac_delim
+COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_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_TOOLKIT_OSX_IPHONE_USE_GUI_1!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim
+COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_IPHONE_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_UNIX_1_TOOLKIT_MGL_USE_GUI_1!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL_USE_GUI_1$ac_delim
COND_PLATFORM_UNIX_1_USE_GUI_1!$COND_PLATFORM_UNIX_1_USE_GUI_1$ac_delim
COND_PLATFORM_UNIX_1_USE_PLUGINS_0!$COND_PLATFORM_UNIX_1_USE_PLUGINS_0$ac_delim
-COND_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
-COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
-COND_SHARED_0!$COND_SHARED_0$ac_delim
-COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0!$COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0$ac_delim
-COND_SHARED_0_TOOLKIT_PM_WXUNIV_0!$COND_SHARED_0_TOOLKIT_PM_WXUNIV_0$ac_delim
-COND_SHARED_0_USE_GUI_1_USE_OPENGL_1!$COND_SHARED_0_USE_GUI_1_USE_OPENGL_1$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBJPEG_builtin$ac_delim
-COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin!$COND_SHARED_0_USE_GUI_1_wxUSE_LIBPNG_builtin$ac_delim
-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
_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_PLATFORM_WIN32_0!$COND_PLATFORM_WIN32_0$ac_delim
+COND_PLATFORM_WIN32_1!$COND_PLATFORM_WIN32_1$ac_delim
+COND_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$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_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_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_OSX_IPHONE_USE_GUI_1!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1$ac_delim
+COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0!$COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0$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_TOOLKIT_X11!$COND_TOOLKIT_X11$ac_delim
COND_TOOLKIT_X11_USE_GUI_1!$COND_TOOLKIT_X11_USE_GUI_1$ac_delim
COND_UNICODE_1!$COND_UNICODE_1$ac_delim
+COND_USE_CAIRO_1!$COND_USE_CAIRO_1$ac_delim
COND_USE_EXCEPTIONS_0!$COND_USE_EXCEPTIONS_0$ac_delim
COND_USE_EXCEPTIONS_1!$COND_USE_EXCEPTIONS_1$ac_delim
COND_USE_GUI_0!$COND_USE_GUI_0$ac_delim
COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim
COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim
COND_USE_RTTI_1!$COND_USE_RTTI_1$ac_delim
-COND_USE_SOSYMLINKS_1!$COND_USE_SOSYMLINKS_1$ac_delim
+COND_USE_SOTWOSYMLINKS_1!$COND_USE_SOTWOSYMLINKS_1$ac_delim
COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1!$COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1$ac_delim
COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim
COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim
+COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1!$COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1$ac_delim
COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim
COND_USE_STC_1!$COND_USE_STC_1$ac_delim
COND_USE_THREADS_0!$COND_USE_THREADS_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
-WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
-USE_GUI!$USE_GUI$ac_delim
-AFMINSTALL!$AFMINSTALL$ac_delim
-WIN32INSTALL!$WIN32INSTALL$ac_delim
-TOOLKIT!$TOOLKIT$ac_delim
-TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
-TOOLCHAIN_NAME!$TOOLCHAIN_NAME$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_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
+WX_LIBRARY_BASENAME_GUI!$WX_LIBRARY_BASENAME_GUI$ac_delim
+USE_GUI!$USE_GUI$ac_delim
+AFMINSTALL!$AFMINSTALL$ac_delim
+WIN32INSTALL!$WIN32INSTALL$ac_delim
+TOOLKIT!$TOOLKIT$ac_delim
+TOOLKIT_DIR!$TOOLKIT_DIR$ac_delim
+TOOLCHAIN_NAME!$TOOLCHAIN_NAME$ac_delim
TOOLCHAIN_FULLNAME!$TOOLCHAIN_FULLNAME$ac_delim
cross_compiling!$cross_compiling$ac_delim
WIDGET_SET!$WIDGET_SET$ac_delim
WX_VERSION!$WX_VERSION$ac_delim
WX_SUBVERSION!$WX_SUBVERSION$ac_delim
WX_CHARTYPE!$WX_CHARTYPE$ac_delim
-WX_DEBUGTYPE!$WX_DEBUGTYPE$ac_delim
WXCONFIG_CPPFLAGS!$WXCONFIG_CPPFLAGS$ac_delim
WXCONFIG_CFLAGS!$WXCONFIG_CFLAGS$ac_delim
WXCONFIG_CXXFLAGS!$WXCONFIG_CXXFLAGS$ac_delim
WXCONFIG_LIBS!$WXCONFIG_LIBS$ac_delim
WXCONFIG_RPATH!$WXCONFIG_RPATH$ac_delim
+WXCONFIG_LDFLAGS!$WXCONFIG_LDFLAGS$ac_delim
WXCONFIG_LDFLAGS_GUI!$WXCONFIG_LDFLAGS_GUI$ac_delim
WXCONFIG_RESFLAGS!$WXCONFIG_RESFLAGS$ac_delim
GUIDIST!$GUIDIST$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 51; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
echo ""
echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_DESC}"
echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}"
-
-echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}"
echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}"
echo $ECHO_N " Should wxWidgets support Unicode? ${wxUSE_UNICODE:-no}$ECHO_C"
if test "$wxUSE_UNICODE" = "yes"; then
projects / wxWidgets.git / blobdiff