X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e6b680de8b5aa3a8c1fe0e054777ed4f4fd5c7b..0b6a0a72722224b6aefc0cdbf946f0eac6ac6016:/configure diff --git a/configure b/configure index 1217820045..568bfc4aba 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 61322 2009-07-05 11:51:53Z VZ . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.1. # @@ -709,6 +709,8 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +HILDON2_CFLAGS +HILDON2_LIBS PYTHON COND_PYTHON CAIRO_CFLAGS @@ -747,7 +749,6 @@ EXTRALIBS_GNOMEPRINT EXTRALIBS_GNOMEVFS EXTRALIBS_HILDON UNICODE -BUILD DEBUG_INFO DEBUG_FLAG TOOLKIT_LOWERCASE @@ -800,7 +801,7 @@ USE_SOVERLINUX USE_SOVERSOLARIS USE_SOVERCYGWIN USE_MACVERSION -USE_SOSYMLINKS +USE_SOTWOSYMLINKS SONAME_FLAG DEPS_TRACKING BK_DEPS @@ -831,6 +832,7 @@ COND_BUILD_release 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 @@ -846,6 +848,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1 +COND_MONOLITHIC_0_SHARED_0_USE_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 @@ -856,6 +859,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1 +COND_MONOLITHIC_0_SHARED_1_USE_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 @@ -866,6 +870,7 @@ COND_MONOLITHIC_0_USE_HTML_1 COND_MONOLITHIC_0_USE_MEDIA_1 COND_MONOLITHIC_0_USE_PROPGRID_1 COND_MONOLITHIC_0_USE_QA_1 +COND_MONOLITHIC_0_USE_RIBBON_1 COND_MONOLITHIC_0_USE_RICHTEXT_1 COND_MONOLITHIC_0_USE_STC_1 COND_MONOLITHIC_0_USE_XRC_1 @@ -970,10 +975,11 @@ COND_USE_PCH_1 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 @@ -1012,7 +1018,6 @@ WX_RELEASE WX_VERSION WX_SUBVERSION WX_CHARTYPE -WX_DEBUGTYPE WXCONFIG_CPPFLAGS WXCONFIG_CFLAGS WXCONFIG_CXXFLAGS @@ -1071,6 +1076,8 @@ GNOMEVFS_CFLAGS GNOMEVFS_LIBS HILDON_CFLAGS HILDON_LIBS +HILDON2_CFLAGS +HILDON2_LIBS CAIRO_CFLAGS CAIRO_LIBS GST_CFLAGS @@ -1664,8 +1671,13 @@ Optional Features: --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-std_iostreams use standard C++ stream classes --enable-std_string use standard C++ string classes @@ -1675,12 +1687,7 @@ Optional Features: --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 @@ -1709,6 +1716,7 @@ Optional Features: --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 @@ -1762,6 +1770,7 @@ Optional Features: --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 @@ -1810,6 +1819,7 @@ Optional Features: --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 @@ -1921,7 +1931,7 @@ Optional Packages: --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 @@ -1982,6 +1992,10 @@ Some influential environment variables: 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 @@ -2913,6 +2927,7 @@ 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 @@ -4318,6 +4333,49 @@ 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= @@ -4329,34 +4387,34 @@ echo "${ECHO_T}$wxUSE_MACOSX_VERSION_MIN" >&6; } 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 = no; then + 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 @@ -4373,34 +4431,214 @@ echo "${ECHO_T}$result" >&6; } 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_info='wxUSE_DEBUG_INFO=yes' + else + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' + fi + +else + + wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" + +fi + + + eval "$wx_cv_use_debug_info" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_INFO = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_DEBUG_INFO + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_debug_gdb='wxUSE_DEBUG_GDB=yes' + else + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' + fi + +else + + wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" + +fi + + + eval "$wx_cv_use_debug_gdb" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_GDB = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_DEBUG_GDB + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' + else + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' + fi + +else + + wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" + +fi + + + eval "$wx_cv_use_debug_cntxt" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_DEBUG_CONTEXT = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_DEBUG_CONTEXT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_debug='wxUSE_DEBUG=yes' + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes' else - wx_cv_use_debug='wxUSE_DEBUG=no' + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' fi else - wx_cv_use_debug='wxUSE_DEBUG=${'DEFAULT_wxUSE_DEBUG":-$defaultval}" + wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" fi - eval "$wx_cv_use_debug" + eval "$wx_cv_use_mem_tracing" if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG = no; then + if test $wxUSE_MEM_TRACING = no; then result=yes else result=no fi else - result=$wxUSE_DEBUG + 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 + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + 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; + if test "$enableval" = yes; then + wx_cv_use_shared='wxUSE_SHARED=yes' + else + wx_cv_use_shared='wxUSE_SHARED=no' + fi + +else + + wx_cv_use_shared='wxUSE_SHARED=${'DEFAULT_wxUSE_SHARED":-$defaultval}" + +fi + + + eval "$wx_cv_use_shared" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_SHARED = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_SHARED fi { echo "$as_me:$LINENO: result: $result" >&5 @@ -4783,114 +5021,6 @@ 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= - 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}-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_debug_flag='wxUSE_DEBUG_FLAG=yes' - else - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no' - fi - -else - - wx_cv_use_debug_flag='wxUSE_DEBUG_FLAG=${'DEFAULT_wxUSE_DEBUG_FLAG":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_flag" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_FLAG = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_DEBUG_FLAG - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_info='wxUSE_DEBUG_INFO=yes' - else - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=no' - fi - -else - - wx_cv_use_debug_info='wxUSE_DEBUG_INFO=${'DEFAULT_wxUSE_DEBUG_INFO":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_info" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_INFO = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_DEBUG_INFO - 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 - -if test "$wxUSE_DEBUG" = "yes"; then - DEFAULT_wxUSE_OPTIMISE=no -fi - enablestring=disable defaultval= @@ -4937,138 +5067,6 @@ echo "${ECHO_T}$result" >&6; } - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_debug_gdb='wxUSE_DEBUG_GDB=yes' - else - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no' - fi - -else - - wx_cv_use_debug_gdb='wxUSE_DEBUG_GDB=${'DEFAULT_wxUSE_DEBUG_GDB":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_gdb" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_GDB = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_DEBUG_GDB - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes' - else - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no' - fi - -else - - wx_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=${'DEFAULT_wxUSE_DEBUG_CONTEXT":-$defaultval}" - -fi - - - eval "$wx_cv_use_debug_cntxt" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_DEBUG_CONTEXT = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_DEBUG_CONTEXT - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - - enablestring= - defaultval= - if test -z "$defaultval"; then - if test x"$enablestring" = xdisable; then - defaultval=yes - else - defaultval=no - fi - fi - - { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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_mem_tracing='wxUSE_MEM_TRACING=yes' - else - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=no' - fi - -else - - wx_cv_use_mem_tracing='wxUSE_MEM_TRACING=${'DEFAULT_wxUSE_MEM_TRACING":-$defaultval}" - -fi - - - eval "$wx_cv_use_mem_tracing" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_MEM_TRACING = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_MEM_TRACING - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval= if test -z "$defaultval"; then @@ -6288,6 +6286,50 @@ 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}-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 @@ -8627,6 +8669,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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 @@ -10802,6 +10888,50 @@ fi echo "${ECHO_T}$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-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 @@ -18107,9 +18237,11 @@ echo "$as_me: error: ar is needed to build wxWidgets" >&2;} fi fi + +if test "$wxUSE_MAC" = 1; then + retest_macosx_linking=no -#if test "$wxUSE_MAC" = 1; then if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then # Implicitly turn on the new --with-macosx-sdk using the default @@ -18153,7 +18285,6 @@ echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_ echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} bk_use_pch=no fi -#fi if test "x$wxUSE_MACOSX_SDK" = "xno"; then wxUSE_MACOSX_SDK= @@ -18387,7 +18518,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - +fi case "${host}" in *-*-darwin* ) @@ -32682,11 +32813,15 @@ echo "${ECHO_T}none" >&6; } 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 @@ -34023,15 +34158,6 @@ if test "$wxUSE_UNICODE" = "yes"; then 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 '-' '_'` @@ -34040,22 +34166,22 @@ if test "$wxUSE_DEBUG_INFO" = "yes"; then 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}${HOST_SUFFIX}" +TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" -TOOLCHAIN_FULLNAME="${HOST_PREFIX}${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 "$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}" + 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 @@ -41519,13 +41645,7 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then fi fi -if test "$wxUSE_DEBUG_FLAG" = "yes" ; then - cat >>confdefs.h <<\_ACEOF -#define WXDEBUG 1 -_ACEOF - - WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -D__WXDEBUG__" -else +if test "$wxUSE_DEBUG_FLAG" = "no" ; then if test "$wxUSE_GTK" = 1 ; then if test "x$wxGTK_VERSION" = "x1" ; then CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS" @@ -42244,6 +42364,13 @@ _ACEOF 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 @@ -43184,6 +43311,7 @@ fi { 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 @@ -43191,6 +43319,7 @@ 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 @@ -43206,8 +43335,99 @@ echo "${ECHO_T}yes" >&6; } #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 @@ -45778,6 +45998,13 @@ _ACEOF 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 @@ -46277,6 +46504,16 @@ _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 @@ -47013,6 +47250,9 @@ if test "$wxUSE_GUI" = "yes"; then 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 @@ -47033,13 +47273,8 @@ fi 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" + LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" fi fi if test "$wxUSE_COCOA" = 1 ; then @@ -47220,7 +47455,7 @@ EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_MEDIA="$GST_LIBS" -EXTRALIBS_STC="-lwxscintilla${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" +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 @@ -47252,7 +47487,7 @@ if test "$wxUSE_ZLIB" = "builtin" ; then 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 @@ -47334,7 +47569,6 @@ fi - TOOLKIT_LOWERCASE=xxx @@ -47377,6 +47611,9 @@ case "$TOOLKIT" in 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 ' '`" @@ -49040,7 +49277,7 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} USE_SOVERLINUX=0 USE_SOVERSOLARIS=0 USE_SOVERCYGWIN=0 - USE_SOSYMLINKS=0 + USE_SOTWOSYMLINKS=0 USE_MACVERSION=0 SONAME_FLAG= @@ -49054,20 +49291,19 @@ echo "$as_me: error: unknown system type $BAKEFILE_HOST." >&2;} 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* ) @@ -49745,6 +49981,11 @@ EOF 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="" @@ -49820,6 +50061,11 @@ EOF 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="" @@ -49870,6 +50116,11 @@ EOF 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="" @@ -49920,6 +50171,11 @@ EOF 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="" @@ -50440,9 +50696,9 @@ EOF 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="#" @@ -50460,6 +50716,11 @@ EOF 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="" @@ -50805,7 +51066,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 @@ -51786,10 +52046,10 @@ GNOMEVFS_CFLAGS!$GNOMEVFS_CFLAGS$ac_delim GNOMEVFS_LIBS!$GNOMEVFS_LIBS$ac_delim HILDON_CFLAGS!$HILDON_CFLAGS$ac_delim HILDON_LIBS!$HILDON_LIBS$ac_delim +HILDON2_CFLAGS!$HILDON2_CFLAGS$ac_delim +HILDON2_LIBS!$HILDON2_LIBS$ac_delim PYTHON!$PYTHON$ac_delim COND_PYTHON!$COND_PYTHON$ac_delim -CAIRO_CFLAGS!$CAIRO_CFLAGS$ac_delim -CAIRO_LIBS!$CAIRO_LIBS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51831,6 +52091,8 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -51865,7 +52127,6 @@ EXTRALIBS_GNOMEPRINT!$EXTRALIBS_GNOMEPRINT$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 @@ -51918,7 +52179,7 @@ USE_SOVERLINUX!$USE_SOVERLINUX$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 @@ -51927,7 +52188,6 @@ REZ!$REZ$ac_delim SETFILE!$SETFILE$ac_delim OBJCXXFLAGS!$OBJCXXFLAGS$ac_delim GCC_PCH!$GCC_PCH$ac_delim -ICC_PCH!$ICC_PCH$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51969,6 +52229,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -51990,6 +52251,7 @@ COND_BUILD_release!$COND_BUILD_release$ac_delim COND_BUILD_release_DEBUG_INFO_default!$COND_BUILD_release_DEBUG_INFO_default$ac_delim COND_BUILD_release_UNICODE_0!$COND_BUILD_release_UNICODE_0$ac_delim COND_BUILD_release_UNICODE_1!$COND_BUILD_release_UNICODE_1$ac_delim +COND_DEBUG_FLAG_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 @@ -52005,6 +52267,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_ 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 @@ -52015,6 +52278,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_ 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 @@ -52025,6 +52289,7 @@ COND_MONOLITHIC_0_USE_HTML_1!$COND_MONOLITHIC_0_USE_HTML_1$ac_delim COND_MONOLITHIC_0_USE_MEDIA_1!$COND_MONOLITHIC_0_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_USE_PROPGRID_1!$COND_MONOLITHIC_0_USE_PROPGRID_1$ac_delim COND_MONOLITHIC_0_USE_QA_1!$COND_MONOLITHIC_0_USE_QA_1$ac_delim +COND_MONOLITHIC_0_USE_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 @@ -52061,11 +52326,6 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52107,6 +52367,11 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -52170,10 +52435,11 @@ COND_USE_PCH_1!$COND_USE_PCH_1$ac_delim COND_USE_PLUGINS_0!$COND_USE_PLUGINS_0$ac_delim COND_USE_RTTI_0!$COND_USE_RTTI_0$ac_delim COND_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 @@ -52198,12 +52464,6 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52245,6 +52505,12 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -52253,7 +52519,6 @@ WX_RELEASE!$WX_RELEASE$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 @@ -52283,7 +52548,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -52914,8 +53179,6 @@ echo "Configured wxWidgets ${WX_VERSION} for \`${host}'" 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