Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable webkit backend if the appropriate headers cannot be found.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-13 12:06:06 +00:00
parent 9d2f31db0c
commit af5fccc140
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -48493,6 +48493,9 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
else else
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ echo "$as_me:$LINENO: WARNING: webkit includes not found; disabling webkit backend" >&5
echo "$as_me: WARNING: webkit includes not found; disabling webkit backend" >&2;}
wxUSE_WEBVIEW_WEBKIT="no"
fi fi
{ echo "$as_me:$LINENO: checking for libsoup includes" >&5 { echo "$as_me:$LINENO: checking for libsoup includes" >&5
echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; } echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; }
@@ -48526,6 +48529,9 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
else else
{ echo "$as_me:$LINENO: result: not found" >&5 { echo "$as_me:$LINENO: result: not found" >&5
echo "${ECHO_T}not found" >&6; } echo "${ECHO_T}not found" >&6; }
{ echo "$as_me:$LINENO: WARNING: libsoup includes not found; disabling webkit backend" >&5
echo "$as_me: WARNING: libsoup includes not found; disabling webkit backend" >&2;}
wxUSE_WEBVIEW_WEBKIT="no"
fi fi
fi fi

4
configure.in
View File

@@ -7397,6 +7397,8 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
CPPFLAGS="$ac_path_to_include $CPPFLAGS" CPPFLAGS="$ac_path_to_include $CPPFLAGS"
else else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
AC_MSG_WARN([webkit includes not found; disabling webkit backend])
wxUSE_WEBVIEW_WEBKIT="no"
fi fi
dnl we also depend on libsoup dnl we also depend on libsoup
AC_MSG_CHECKING(for libsoup includes) AC_MSG_CHECKING(for libsoup includes)
@@ -7407,6 +7409,8 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
CPPFLAGS="$ac_path_to_include $CPPFLAGS" CPPFLAGS="$ac_path_to_include $CPPFLAGS"
else else
AC_MSG_RESULT([not found]) AC_MSG_RESULT([not found])
AC_MSG_WARN([libsoup includes not found; disabling webkit backend])
wxUSE_WEBVIEW_WEBKIT="no"
fi fi
fi fi