X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e3e89e62606defd97d70c99dd1c59dd902f64246..1d3a930e82ed6eb40e8ddce64997a8a017f4f49d:/configure?ds=sidebyside diff --git a/configure b/configure index e372e96e00..46e9ce3397 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id: configure.in 67603 2011-04-26 17:35:35Z RD . +# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.2. +# Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3. # # Report bugs to . # @@ -575,8 +575,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.2' -PACKAGE_STRING='wxWidgets 2.9.2' +PACKAGE_VERSION='2.9.3' +PACKAGE_STRING='wxWidgets 2.9.3' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' ac_unique_file="wx-config.in" @@ -849,6 +849,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1 +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_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 @@ -860,6 +861,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1 +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_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 @@ -875,6 +877,7 @@ 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_WEBVIEW_1 COND_MONOLITHIC_0_USE_XRC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 @@ -1596,7 +1599,7 @@ if test "$ac_init_help" = "long"; then # 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.2 to adapt to many kinds of systems. +\`configure' configures wxWidgets 2.9.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1665,7 +1668,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.2:";; + short | recursive ) echo "Configuration of wxWidgets 2.9.3:";; esac cat <<\_ACEOF @@ -1796,19 +1799,20 @@ Optional Features: --enable-mdidoc use docview architecture with MDI --enable-mediactrl use wxMediaCtrl class --enable-gstreamer8 force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix - --enable-webkit use wxWebKitCtrl (Mac) --enable-richtext use wxRichTextCtrl --enable-postscript use wxPostscriptDC device context (default for gtk+) --enable-printarch use printing architecture --enable-svg use wxSVGFileDC device context + --enable-webkit use wxWebKitCtrl (Mac-only, use wxWebView instead) + --enable-webview use wxWebView library --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-bannerwindow use wxBannerWindow class --enable-artstd use standard XPM icons in wxArtProvider --enable-arttango use Tango icons in wxArtProvider --enable-bmpbutton use wxBitmapButton class @@ -1850,6 +1854,7 @@ Optional Features: --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class --enable-richmsgdlg use wxRichMessageDialog class + --enable-richtooltip use wxRichToolTip class --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog --enable-sash use wxSashWindow class --enable-scrollbar use wxScrollBar class and scrollable windows @@ -1866,12 +1871,14 @@ Optional Features: --enable-taskbaricon use wxTaskBarIcon class --enable-tbarnative use native wxToolBar class --enable-textctrl use wxTextCtrl class + --enable-timepick use wxTimePickerCtrl class --enable-tipwindow use wxTipWindow class --enable-togglebtn use wxToggleButton class --enable-toolbar use wxToolBar class --enable-toolbook use wxToolbook class --enable-treebook use wxTreebook class --enable-treectrl use wxTreeCtrl class + --enable-treelist use wxTreeListCtrl class --enable-commondlg use all common dialogs --enable-aboutdlg use wxAboutBox --enable-choicedlg use wxChoiceDialog @@ -1894,12 +1901,14 @@ Optional Features: --enable-mousewheel use mousewheel --enable-validators use wxValidator and derived classes --enable-busyinfo use wxBusyInfo + --enable-hotkey use wxWindow::RegisterHotKey() --enable-joystick use wxJoystick - --enable-metafiles use wxMetaFile (Win32 only) + --enable-metafiles use wxMetaFile --enable-dragimage use wxDragImage --enable-accessibility enable accessibility support --enable-uiactionsim use wxUIActionSimulator (experimental) --enable-dctransform use wxDC::SetTransformMatrix and related + --enable-webview-webkit use wxWebView WebKit backend --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -1914,6 +1923,7 @@ Optional Features: --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) + --enable-webview-ie use wxWebView IE backend (Win32 only) --enable-autoidman use automatic ids management --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program @@ -2095,7 +2105,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.2 +wxWidgets configure 2.9.3 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -2109,7 +2119,7 @@ cat >config.log <<_ACEOF 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.2, which was +It was created by wxWidgets $as_me 2.9.3, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2591,7 +2601,7 @@ fi wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=2 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -2974,7 +2984,7 @@ esac DEFAULT_wxUSE_ALL_FEATURES=yes -DEFAULT_wxUSE_STD_CONTAINERS=$DEFAULT_STD_FLAG +DEFAULT_wxUSE_STD_CONTAINERS=no DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG @@ -2994,6 +3004,8 @@ DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_OPENGL=auto DEFAULT_wxUSE_MEDIACTRL=auto DEFAULT_wxUSE_COMPILER_TLS=auto +DEFAULT_wxUSE_HOTKEY=auto +DEFAULT_wxUSE_METAFILE=auto DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no @@ -4778,6 +4790,11 @@ fi { echo "$as_me:$LINENO: result: $result" >&5 echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_STL" = "yes"; then + DEFAULT_wxUSE_STD_CONTAINERS=yes + DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_STRING=yes +fi enablestring= defaultval= @@ -9397,50 +9414,6 @@ 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}-webkit" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } - # Check whether --enable-webkit was given. -if test "${enable_webkit+set}" = set; then - enableval=$enable_webkit; - if test "$enableval" = yes; then - wx_cv_use_webkit='wxUSE_WEBKIT=yes' - else - wx_cv_use_webkit='wxUSE_WEBKIT=no' - fi - -else - - wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" - -fi - - - eval "$wx_cv_use_webkit" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_WEBKIT = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_WEBKIT - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -9617,6 +9590,94 @@ 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}-webkit" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webkit... $ECHO_C" >&6; } + # Check whether --enable-webkit was given. +if test "${enable_webkit+set}" = set; then + enableval=$enable_webkit; + if test "$enableval" = yes; then + wx_cv_use_webkit='wxUSE_WEBKIT=yes' + else + wx_cv_use_webkit='wxUSE_WEBKIT=no' + fi + +else + + wx_cv_use_webkit='wxUSE_WEBKIT=${'DEFAULT_wxUSE_WEBKIT":-$defaultval}" + +fi + + + eval "$wx_cv_use_webkit" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBKIT = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBKIT + 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}-webview" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webview... $ECHO_C" >&6; } + # Check whether --enable-webview was given. +if test "${enable_webview+set}" = set; then + enableval=$enable_webview; + if test "$enableval" = yes; then + wx_cv_use_webview='wxUSE_WEBVIEW=yes' + else + wx_cv_use_webview='wxUSE_WEBVIEW=no' + fi + +else + + wx_cv_use_webview='wxUSE_WEBVIEW=${'DEFAULT_wxUSE_WEBVIEW":-$defaultval}" + +fi + + + eval "$wx_cv_use_webview" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBVIEW = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBVIEW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_MAC" != 1; then enablestring= @@ -9754,50 +9815,6 @@ 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}-metafile" >&5 -echo $ECHO_N "checking for --${enablestring:-enable}-metafile... $ECHO_C" >&6; } - # Check whether --enable-metafile was given. -if test "${enable_metafile+set}" = set; then - enableval=$enable_metafile; - if test "$enableval" = yes; then - wx_cv_use_metafile='wxUSE_METAFILE=yes' - else - wx_cv_use_metafile='wxUSE_METAFILE=no' - fi - -else - - wx_cv_use_metafile='wxUSE_METAFILE=${'DEFAULT_wxUSE_METAFILE":-$defaultval}" - -fi - - - eval "$wx_cv_use_metafile" - - if test x"$enablestring" = xdisable; then - if test $wxUSE_METAFILE = no; then - result=yes - else - result=no - fi - else - result=$wxUSE_METAFILE - fi - - { echo "$as_me:$LINENO: result: $result" >&5 -echo "${ECHO_T}$result" >&6; } - - DEFAULT_wxUSE_CONTROLS=none @@ -9848,6 +9865,7 @@ echo "${ECHO_T}$result" >&6; } if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_ACCEL=no DEFAULT_wxUSE_ANIMATIONCTRL=no + DEFAULT_wxUSE_BANNERWINDOW=no DEFAULT_wxUSE_BMPBUTTON=no DEFAULT_wxUSE_BUTTON=no DEFAULT_wxUSE_CALCTRL=no @@ -9883,6 +9901,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no DEFAULT_wxUSE_RICHMSGDLG=no + DEFAULT_wxUSE_RICHTOOLTIP=no DEFAULT_wxUSE_REARRANGECTRL=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no @@ -9895,6 +9914,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_STATBOX=no DEFAULT_wxUSE_STATLINE=no DEFAULT_wxUSE_STATUSBAR=no + DEFAULT_wxUSE_TIMEPICKCTRL=no DEFAULT_wxUSE_TIPWINDOW=no DEFAULT_wxUSE_TOGGLEBTN=no DEFAULT_wxUSE_TOOLBAR=no @@ -9903,6 +9923,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_TREEBOOK=no DEFAULT_wxUSE_TREECTRL=no + DEFAULT_wxUSE_TREELISTCTRL=no fi @@ -10039,6 +10060,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}-bannerwindow" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-bannerwindow... $ECHO_C" >&6; } + # Check whether --enable-bannerwindow was given. +if test "${enable_bannerwindow+set}" = set; then + enableval=$enable_bannerwindow; + if test "$enableval" = yes; then + wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=yes' + else + wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=no' + fi + +else + + wx_cv_use_bannerwindow='wxUSE_BANNERWINDOW=${'DEFAULT_wxUSE_BANNERWINDOW":-$defaultval}" + +fi + + + eval "$wx_cv_use_bannerwindow" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_BANNERWINDOW = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_BANNERWINDOW + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -11843,6 +11908,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}-richtooltip" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-richtooltip... $ECHO_C" >&6; } + # Check whether --enable-richtooltip was given. +if test "${enable_richtooltip+set}" = set; then + enableval=$enable_richtooltip; + if test "$enableval" = yes; then + wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=yes' + else + wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=no' + fi + +else + + wx_cv_use_richtooltip='wxUSE_RICHTOOLTIP=${'DEFAULT_wxUSE_RICHTOOLTIP":-$defaultval}" + +fi + + + eval "$wx_cv_use_richtooltip" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_RICHTOOLTIP = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_RICHTOOLTIP + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12547,6 +12656,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}-datepick" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-datepick... $ECHO_C" >&6; } + # Check whether --enable-datepick was given. +if test "${enable_datepick+set}" = set; then + enableval=$enable_datepick; + if test "$enableval" = yes; then + wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=yes' + else + wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=no' + fi + +else + + wx_cv_use_datepick='wxUSE_TIMEPICKCTRL=${'DEFAULT_wxUSE_TIMEPICKCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_datepick" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TIMEPICKCTRL = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_TIMEPICKCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -12811,6 +12964,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}-treelist" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-treelist... $ECHO_C" >&6; } + # Check whether --enable-treelist was given. +if test "${enable_treelist+set}" = set; then + enableval=$enable_treelist; + if test "$enableval" = yes; then + wx_cv_use_treelist='wxUSE_TREELISTCTRL=yes' + else + wx_cv_use_treelist='wxUSE_TREELISTCTRL=no' + fi + +else + + wx_cv_use_treelist='wxUSE_TREELISTCTRL=${'DEFAULT_wxUSE_TREELISTCTRL":-$defaultval}" + +fi + + + eval "$wx_cv_use_treelist" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_TREELISTCTRL = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_TREELISTCTRL + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= @@ -13783,6 +13980,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}-hotkey" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-hotkey... $ECHO_C" >&6; } + # Check whether --enable-hotkey was given. +if test "${enable_hotkey+set}" = set; then + enableval=$enable_hotkey; + if test "$enableval" = yes; then + wx_cv_use_hotkey='wxUSE_HOTKEY=yes' + else + wx_cv_use_hotkey='wxUSE_HOTKEY=no' + fi + +else + + wx_cv_use_hotkey='wxUSE_HOTKEY=${'DEFAULT_wxUSE_HOTKEY":-$defaultval}" + +fi + + + eval "$wx_cv_use_hotkey" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_HOTKEY = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_HOTKEY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -14047,6 +14288,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}-webviewwebkit" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webviewwebkit... $ECHO_C" >&6; } + # Check whether --enable-webviewwebkit was given. +if test "${enable_webviewwebkit+set}" = set; then + enableval=$enable_webviewwebkit; + if test "$enableval" = yes; then + wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=yes' + else + wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=no' + fi + +else + + wx_cv_use_webviewwebkit='wxUSE_WEBVIEW_WEBKIT=${'DEFAULT_wxUSE_WEBVIEW_WEBKIT":-$defaultval}" + +fi + + + eval "$wx_cv_use_webviewwebkit" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBVIEW_WEBKIT = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBVIEW_WEBKIT + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + enablestring= @@ -14667,6 +14952,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}-webviewie" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-webviewie... $ECHO_C" >&6; } + # Check whether --enable-webviewie was given. +if test "${enable_webviewie+set}" = set; then + enableval=$enable_webviewie; + if test "$enableval" = yes; then + wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=yes' + else + wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=no' + fi + +else + + wx_cv_use_webviewie='wxUSE_WEBVIEW_IE=${'DEFAULT_wxUSE_WEBVIEW_IE":-$defaultval}" + +fi + + + eval "$wx_cv_use_webviewie" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_WEBVIEW_IE = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_WEBVIEW_IE + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + if test "$wxUSE_MSW" != 1; then DEFAULT_wxUSE_AUTOID_MANAGEMENT=no fi @@ -17233,7 +17562,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_prog_gcc_traditional=no fi -rm -f -r conftest* +rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -17250,7 +17579,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "$ac_pattern" >/dev/null 2>&1; then ac_cv_prog_gcc_traditional=yes fi -rm -f -r conftest* +rm -f conftest* fi fi @@ -19876,7 +20205,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -19897,7 +20226,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -24702,11 +25031,13 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -24746,11 +25077,13 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGEFILE_SOURCE 1 -#include +#include /* for off_t */ + #include int main () { -return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0); +int (*fp) (FILE *, off_t, int) = fseeko; + return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); ; return 0; } @@ -24797,7 +25130,7 @@ cat >>confdefs.h <<_ACEOF _ACEOF ;; esac -rm -f -r conftest* +rm -f conftest* # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug # in glibc 2.1.3, but that breaks too many other things. @@ -26758,8 +27091,8 @@ SEARCH_INCLUDE="\ \ /usr/openwin/share/include" -{ echo "$as_me:$LINENO: checking for libraries directory" >&5 -echo $ECHO_N "checking for libraries directory... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking for libraries directories" >&5 +echo $ECHO_N "checking for libraries directories... $ECHO_C" >&6; } case "${host}" in *-*-irix6* ) @@ -26811,9 +27144,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ fi done done - if test "x$wx_cv_std_libpath" = "x"; then - wx_cv_std_libpath="lib" - fi fi @@ -26823,29 +27153,44 @@ fi *-*-solaris2* ) if test "$ac_cv_sizeof_void_p" = 8 -a -d "/usr/lib/64"; then wx_cv_std_libpath="lib/64" - else - wx_cv_std_libpath="lib" fi ;; *-*-linux* ) - if test "$ac_cv_sizeof_void_p" = 8 -a \ - -d "/usr/lib64" -a ! -h "/usr/lib64"; then - wx_cv_std_libpath="lib64" + if test "$ac_cv_sizeof_void_p" = 8; then + if test -d "/usr/lib/`uname -m`-linux-gnu"; then + wx_cv_std_libfullpath="/usr/lib/`uname -m`-linux-gnu" + elif test -d "/usr/lib64" -a ! -h "/usr/lib64"; then + wx_cv_std_libpath="lib64" + fi else - wx_cv_std_libpath="lib" + case "${host}" in + i*86-*-linux* ) + if test -d '/usr/lib/i386-linux-gnu'; then + wx_cv_std_libfullpath='/usr/lib/i386-linux-gnu' + fi + esac fi - ;; - *) - wx_cv_std_libpath="lib"; + if test -n "$wx_cv_std_libfullpath" -a -d "/usr/lib"; then + wx_cv_std_libfullpath="$wx_cv_std_libfullpath /usr/lib" + fi ;; esac -{ echo "$as_me:$LINENO: result: $wx_cv_std_libpath" >&5 -echo "${ECHO_T}$wx_cv_std_libpath" >&6; } +if test -z "$wx_cv_std_libpath"; then + wx_cv_std_libpath="lib" +fi + +if test -z "$wx_cv_std_libfullpath"; then + wx_cv_std_libfullpath="/usr/$wx_cv_std_libpath" +fi -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath" + +{ echo "$as_me:$LINENO: result: $wx_cv_std_libfullpath" >&5 +echo "${ECHO_T}$wx_cv_std_libfullpath" >&6; } + +SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` $wx_cv_std_libfullpath" if test "$build" != "$host" -a "$GCC" = yes; then if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then @@ -29619,7 +29964,6 @@ if test "$wxUSE_GUI" = "yes"; then GUI_TK_LIBRARY= - WXGTK12= WXGTK127= WXGTK2= WXGPE= @@ -29992,8 +30336,6 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ rm -f conf.gtktest - - GTK_LIBS="$GTK_LIBS -lX11" fi if test -z "$wx_cv_lib_gtk"; then @@ -30653,6 +30995,8 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ if test -z "$wx_cv_lib_gtk"; then wx_cv_lib_gtk=none else + GTK_LIBS="$GTK_LIBS -lX11" + wx_cv_cflags_gtk=$GTK_CFLAGS wx_cv_libs_gtk=$GTK_LIBS fi @@ -30671,10 +31015,8 @@ echo "${ECHO_T}$wx_cv_lib_gtk" >&6; } TOOLKIT_VERSION=2 ;; 1.2.7) WXGTK127=1 - WXGTK12=1 - ;; - 1.2.3) WXGTK12=1 ;; + 1.2*) ;; *) { { echo "$as_me:$LINENO: error: The development files for GTK+ were not found. For GTK+ 2, please ensure that pkg-config is in the path and that gtk+-2.0.pc is @@ -31081,9 +31423,6 @@ done 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 @@ -31489,7 +31828,7 @@ _ACEOF eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && test -f "$ac_im_libdir/libX11.$ac_extension"; then ac_im_usrlibdir=$ac_im_libdir; break @@ -31642,7 +31981,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do + for ac_extension in a so sl; do if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 @@ -34992,6 +35331,11 @@ cat >>conftest.$ac_ext <<_ACEOF error this platform has no visibility; #endif + /* at the time of Xcode 4.1 / Clang 3, Clang++ still didn't have the bugs sorted out: */ + #if defined(__clang__) + clang compiler is still broken w.r.t. visibility; + #endif + extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); @@ -42861,14 +43205,6 @@ fi if test "$WXGTK2" = 1 ; then cat >>confdefs.h <<_ACEOF #define __WXGTK20__ $WXGTK2 -_ACEOF - - WXGTK12=1 -fi - -if test "$WXGTK12" = 1 ; then - cat >>confdefs.h <<_ACEOF -#define __WXGTK12__ $WXGTK12 _ACEOF fi @@ -42908,6 +43244,8 @@ 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" + else + CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS" fi fi fi @@ -43746,6 +44084,12 @@ _ACEOF else wxUSE_FSWATCHER=no fi + else + if test "$wxUSE_THREADS" != "yes"; then + { echo "$as_me:$LINENO: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&5 +echo "$as_me: WARNING: wxFileSystemWatcher disabled due to --disable-threads" >&2;} + wxUSE_FSWATCHER=no + fi fi if test "$wxUSE_FSWATCHER" = "yes"; then @@ -45011,6 +45355,24 @@ _ACEOF fi +if test "$wxUSE_HOTKEY" = "yes"; then + if test "$wxUSE_MSW" != 1 -a "$wxUSE_OSX_COCOA" != 1 -a "$wxUSE_OSX_CARBON" != 1; then + { echo "$as_me:$LINENO: WARNING: Hot keys not supported by the current toolkit, disabled" >&5 +echo "$as_me: WARNING: Hot keys not supported by the current toolkit, disabled" >&2;} + wxUSE_HOTKEY=no + fi +elif test "$wxUSE_HOTKEY" = "auto"; then + if test "$wxUSE_MSW" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_OSX_CARBON" = 1; then + wxUSE_HOTKEY=yes + fi +fi +if test "$wxUSE_HOTKEY" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_HOTKEY 1 +_ACEOF + +fi + if test "$wxUSE_STD_CONTAINERS" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_STD_CONTAINERS 1 @@ -46944,6 +47306,23 @@ if test "$wxUSE_METAFILE" = "yes"; then echo "$as_me: WARNING: wxMetafile is not available on this system... disabled" >&2;} wxUSE_METAFILE=no fi +elif test "$wxUSE_METAFILE" = "auto"; then + if test "$wxUSE_MSW" = 1 -o "$wxUSE_MAC" = 1 -o "$wxUSE_PM" = 1; then + wxUSE_METAFILE=yes + fi +fi + +if test "$wxUSE_METAFILE" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_METAFILE 1 +_ACEOF + + if test "$wxUSE_MSW" = 1; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_ENH_METAFILE 1 +_ACEOF + + fi fi @@ -47080,18 +47459,6 @@ echo "$as_me: WARNING: Some features disabled because OLE headers not found" >&2 wxUSE_DATAOBJ=no wxUSE_OLE=no fi - - if test "$wxUSE_METAFILE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_METAFILE 1 -_ACEOF - - - cat >>confdefs.h <<\_ACEOF -#define wxUSE_ENH_METAFILE 1 -_ACEOF - - fi fi if test "$wxUSE_IPC" = "yes"; then @@ -47144,14 +47511,6 @@ _ACEOF fi if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then - if test "$wxUSE_GTK" = 1; then - if test "$WXGTK12" != 1; then - { echo "$as_me:$LINENO: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&5 -echo "$as_me: WARNING: Drag and drop is only supported under GTK+ 1.2... disabled" >&2;} - wxUSE_DRAG_AND_DROP=no - fi - fi - if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_MGL" = 1 -o \ "$wxUSE_DFB" = 1; then { echo "$as_me:$LINENO: WARNING: Drag and drop not yet supported under $TOOLKIT... disabled" >&5 @@ -47235,6 +47594,13 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS animate" fi +if test "$wxUSE_BANNERWINDOW" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_BANNERWINDOW 1 +_ACEOF + +fi + if test "$wxUSE_BUTTON" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_BUTTON 1 @@ -47560,6 +47926,13 @@ _ACEOF fi +if test "$wxUSE_RICHTOOLTIP" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_RICHTOOLTIP 1 +_ACEOF + +fi + if test "$wxUSE_SASH" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_SASH 1 @@ -47681,6 +48054,14 @@ _ACEOF fi +if test "$wxUSE_TIMEPICKCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TIMEPICKCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_TOGGLEBTN" = "yes"; then if test "$wxUSE_OLD_COCOA" = 1 ; then { echo "$as_me:$LINENO: WARNING: Toggle button not yet supported under Mac OS X... disabled" >&5 @@ -47764,6 +48145,14 @@ echo "$as_me: WARNING: wxTreeCtrl requires wxImageList and won't be compiled wit fi fi +if test "$wxUSE_TREELISTCTRL" = "yes"; then + cat >>confdefs.h <<\_ACEOF +#define wxUSE_TREELISTCTRL 1 +_ACEOF + + USES_CONTROLS=1 +fi + if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_OLD_COCOA" = 1 ; then { echo "$as_me:$LINENO: WARNING: Popup window not yet supported under Mac OS X... disabled" >&5 @@ -48070,13 +48459,6 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu" fi -if test "$wxUSE_METAFILE" = "yes"; then - cat >>confdefs.h <<\_ACEOF -#define wxUSE_METAFILE 1 -_ACEOF - -fi - if test "$wxUSE_MIMETYPE" = "yes"; then cat >>confdefs.h <<\_ACEOF #define wxUSE_MIMETYPE 1 @@ -48142,6 +48524,225 @@ _ACEOF SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" fi +if test "$wxUSE_WEBVIEW" = "yes"; then + USE_WEBVIEW_WEBKIT=0 + if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then + if test "$wxUSE_GTK" = 1; then + { echo "$as_me:$LINENO: checking for webkitgtk libraries" >&5 +echo $ECHO_N "checking for webkitgtk libraries... $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/libwebkitgtk-1.0.$ac_extension"; then + ac_find_libraries=$ac_dir + break 2 + fi + done + done + + if test "$ac_find_libraries" != "" ; then + + if test "$ac_find_libraries" = "default location"; then + ac_path_to_link="" + else + echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_link="" + else + ac_path_to_link=" -L$ac_find_libraries" + fi + fi + + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS="$LDFLAGS $ac_path_to_link" + fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + + { echo "$as_me:$LINENO: checking for webkitgtk headers" >&5 +echo $ECHO_N "checking for webkitgtk headers... $ECHO_C" >&6; } + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include + do + if test -f "$ac_dir/webkit/webkit.h"; then + ac_find_includes=$ac_dir + break + fi + done + + if test "$ac_find_includes" != "" ; then + { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5 +echo "${ECHO_T}found in $ac_find_includes" >&6; } + + if test "x$ac_find_includes" = "x/usr/include"; then + ac_path_to_include="" + else + echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include=" -I$ac_find_includes" + fi + fi + + CPPFLAGS="$ac_path_to_include $CPPFLAGS" + + { echo "$as_me:$LINENO: checking for libsoup headers" >&5 +echo $ECHO_N "checking for libsoup headers... $ECHO_C" >&6; } + +ac_find_includes= +for ac_dir in $SEARCH_INCLUDE /usr/include/libsoup-2.4 /usr/include + do + if test -f "$ac_dir/libsoup/soup.h"; then + ac_find_includes=$ac_dir + break + fi + done + + if test "$ac_find_includes" != "" ; then + { echo "$as_me:$LINENO: result: found in $ac_find_includes" >&5 +echo "${ECHO_T}found in $ac_find_includes" >&6; } + + if test "x$ac_find_includes" = "x/usr/include"; then + ac_path_to_include="" + else + echo "$CPPFLAGS" | grep "\-I$ac_find_includes" > /dev/null + result=$? + if test $result = 0; then + ac_path_to_include="" + else + ac_path_to_include=" -I$ac_find_includes" + fi + fi + + CPPFLAGS="$ac_path_to_include $CPPFLAGS" + + USE_WEBVIEW_WEBKIT=1 + else + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + { echo "$as_me:$LINENO: WARNING: libsoup headers not found; disabling WebKit backend" >&5 +echo "$as_me: WARNING: libsoup headers not found; disabling WebKit backend" >&2;} + fi + else + { echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6; } + { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling WebKit backend" >&5 +echo "$as_me: WARNING: WebKit headers not found; disabling WebKit backend" >&2;} + fi + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + { echo "$as_me:$LINENO: WARNING: WebKit libraries not found; disabling WebKit backend" >&5 +echo "$as_me: WARNING: WebKit libraries not found; disabling WebKit backend" >&2;} + fi + elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-x objective-c++ $CPPFLAGS" + { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5 +echo $ECHO_N "checking for WebKit/HIWebView.h... $ECHO_C" >&6; } +if test "${ac_cv_header_WebKit_HIWebView_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #include + #include + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_WebKit_HIWebView_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_WebKit_HIWebView_h=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_WebKit_HIWebView_h" >&5 +echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; } +if test $ac_cv_header_WebKit_HIWebView_h = yes; then + + USE_WEBVIEW_WEBKIT=1 + WEBKIT_LINK="-framework WebKit" + +else + + { echo "$as_me:$LINENO: WARNING: WebKit headers not found" >&5 +echo "$as_me: WARNING: WebKit headers not found" >&2;} + +fi + + + CPPFLAGS="$old_CPPFLAGS" + fi + fi + + wxUSE_WEBVIEW="no" + if test "$wxUSE_GTK" = 1 -o "$wxUSE_MAC" = 1; then + if test "$USE_WEBVIEW_WEBKIT" = 1; then + wxUSE_WEBVIEW="yes" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBVIEW_WEBKIT 1 +_ACEOF + + else + { echo "$as_me:$LINENO: WARNING: WebKit not available, disabling wxWebView" >&5 +echo "$as_me: WARNING: WebKit not available, disabling wxWebView" >&2;} + fi + elif test "$wxUSE_MSW" = 1; then + if test "wxUSE_WEBVIEW_IE" = "yes"; then + wxUSE_WEBVIEW="yes" + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBVIEW_IE 1 +_ACEOF + + fi + fi +fi + +if test "$wxUSE_WEBVIEW" = "yes"; then + USE_WEBVIEW=1 + cat >>confdefs.h <<\_ACEOF +#define wxUSE_WEBVIEW 1 +_ACEOF + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview" +else + USE_WEBVIEW=0 +fi + if test "$wxUSE_IMAGE" = "yes" ; then cat >>confdefs.h <<\_ACEOF @@ -48938,6 +49539,10 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_STC" = "yes" ; then BUILT_WX_LIBS="stc $BUILT_WX_LIBS" fi + if test "$wxUSE_WEBVIEW" = "yes" ; then + STD_GUI_LIBS="webview $STD_GUI_LIBS" + BUILT_WX_LIBS="webview $BUILT_WX_LIBS" + fi if test "$wxUSE_XRC" = "yes" ; then STD_GUI_LIBS="xrc $STD_GUI_LIBS" BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" @@ -49895,20 +50500,7 @@ else fi - { echo "$as_me:$LINENO: checking for command to install directories" >&5 -echo $ECHO_N "checking for command to install directories... $ECHO_C" >&6; } - INSTALL_TEST_DIR=acbftest$$ - $INSTALL -d $INSTALL_TEST_DIR > /dev/null 2>&1 - if test $? = 0 -a -d $INSTALL_TEST_DIR; then - rmdir $INSTALL_TEST_DIR - INSTALL_DIR='$(INSTALL) -d' - { echo "$as_me:$LINENO: result: $INSTALL -d" >&5 -echo "${ECHO_T}$INSTALL -d" >&6; } - else INSTALL_DIR="mkdir -p" - { echo "$as_me:$LINENO: result: mkdir -p" >&5 -echo "${ECHO_T}mkdir -p" >&6; } - fi LDFLAGS_GUI= @@ -51733,6 +52325,11 @@ EOF COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1="" fi + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then + COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1="" + fi + COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x0" -a "x$USE_PROPGRID" = "x1" ; then COND_MONOLITHIC_0_SHARED_0_USE_PROPGRID_1="" @@ -51788,6 +52385,11 @@ EOF COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1="" fi + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_GUI" = "x1" -a "x$USE_WEBVIEW" = "x1" ; then + COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1="" + fi + COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="#" if test "x$MONOLITHIC" = "x0" -a "x$SHARED" = "x1" -a "x$USE_PROPGRID" = "x1" ; then COND_MONOLITHIC_0_SHARED_1_USE_PROPGRID_1="" @@ -51863,6 +52465,11 @@ EOF COND_MONOLITHIC_0_USE_STC_1="" fi + COND_MONOLITHIC_0_USE_WEBVIEW_1="#" + if test "x$MONOLITHIC" = "x0" -a "x$USE_WEBVIEW" = "x1" ; then + COND_MONOLITHIC_0_USE_WEBVIEW_1="" + fi + COND_MONOLITHIC_0_USE_XRC_1="#" if test "x$MONOLITHIC" = "x0" -a "x$USE_XRC" = "x1" ; then COND_MONOLITHIC_0_USE_XRC_1="" @@ -53419,7 +54026,7 @@ exec 6>&1 # 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.2, which was +This file was extended by wxWidgets $as_me 2.9.3, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -53472,7 +54079,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -wxWidgets config.status 2.9.2 +wxWidgets config.status 2.9.3 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -53981,6 +54588,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1$ac_de COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_QA_1$ac_delim +COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_1!$COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_WEBVIEW_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 @@ -53992,6 +54600,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1$ac_de COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_HTML_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_MEDIA_1$ac_delim COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_QA_1$ac_delim +COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_1!$COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_WEBVIEW_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 @@ -54007,6 +54616,7 @@ 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_WEBVIEW_1!$COND_MONOLITHIC_0_USE_WEBVIEW_1$ac_delim COND_MONOLITHIC_0_USE_XRC_1!$COND_MONOLITHIC_0_USE_XRC_1$ac_delim COND_MONOLITHIC_1!$COND_MONOLITHIC_1$ac_delim COND_MONOLITHIC_1_SHARED_0!$COND_MONOLITHIC_1_SHARED_0$ac_delim @@ -54036,9 +54646,6 @@ COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim COND_PLATFORM_UNIX_0!$COND_PLATFORM_UNIX_0$ac_delim COND_PLATFORM_UNIX_1!$COND_PLATFORM_UNIX_1$ac_delim COND_PLATFORM_UNIX_1_TOOLKIT_MGL!$COND_PLATFORM_UNIX_1_TOOLKIT_MGL$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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54080,6 +54687,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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_PLATFORM_WIN32_1_SHARED_0!$COND_PLATFORM_WIN32_1_SHARED_0$ac_delim @@ -54174,9 +54784,6 @@ COND_WXUNIV_1!$COND_WXUNIV_1$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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -54218,6 +54825,9 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +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 @@ -54271,7 +54881,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` = 51; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5