Disable webkit backend if the appropriate headers cannot be found.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure b/configure
index ec96db56beef461d78d543af9f466af3856995fe..3f76dfc737366a696825c19efb3b872a5f98bf00 100755 (executable)
--- a/configure
+++ b/configure
@@ -48493,6 +48493,9 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
        else
            { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
        else
            { echo "$as_me:$LINENO: result: not found" >&5
 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
               { echo "$as_me:$LINENO: checking for libsoup includes" >&5
 echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; }
        fi
               { echo "$as_me:$LINENO: checking for libsoup includes" >&5
 echo $ECHO_N "checking for libsoup includes... $ECHO_C" >&6; }


@@ -48526,6 +48529,9 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
        else
            { echo "$as_me:$LINENO: result: not found" >&5
 echo "${ECHO_T}not found" >&6; }
        else
            { echo "$as_me:$LINENO: result: not found" >&5
 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
 

diff --git a/configure.in b/configure.in
index 78d363963b0ba9daf7198ff364b4a2d4ba5d0292..54811fc1a48292a2a20a80647236a7ce140c019a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7397,6 +7397,8 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
        else
            AC_MSG_RESULT([not found])
            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
        else
            AC_MSG_RESULT([not found])

+           AC_MSG_WARN([webkit includes not found; disabling webkit backend])
+           wxUSE_WEBVIEW_WEBKIT="no"

        fi
        dnl we also depend on libsoup
        AC_MSG_CHECKING(for libsoup includes)
        fi
        dnl we also depend on libsoup
        AC_MSG_CHECKING(for libsoup includes)


@@ -7407,6 +7409,8 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
        else
            AC_MSG_RESULT([not found])
            CPPFLAGS="$ac_path_to_include $CPPFLAGS"
        else
            AC_MSG_RESULT([not found])

+           AC_MSG_WARN([libsoup includes not found; disabling webkit backend])
+           wxUSE_WEBVIEW_WEBKIT="no"

        fi
    fi
 
        fi
    fi