Correctly disable webkit backend if the appropriate headers cannot be found.

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

diff --git a/configure b/configure
index 3f76dfc737366a696825c19efb3b872a5f98bf00..cf8687b94e4f0936b24a749ba1283665515db383 100755 (executable)
--- a/configure
+++ b/configure
@@ -48458,7 +48458,10 @@ echo "${ECHO_T}yes" >&6; }
 echo "${ECHO_T}no" >&6; }
            { echo "$as_me:$LINENO: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&5
 echo "$as_me: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&2;}
 echo "${ECHO_T}no" >&6; }
            { echo "$as_me:$LINENO: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&5
 echo "$as_me: WARNING: libwebkitgtk-1.0 not found; disabling webkit backend" >&2;}

-           wxUSE_WEBVIEW_WEBKIT="no"
+           cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_WEBKIT 0
+_ACEOF
+

        fi
 
        { echo "$as_me:$LINENO: checking for webkitgtk includes" >&5
        fi
 
        { echo "$as_me:$LINENO: checking for webkitgtk includes" >&5


@@ -48495,7 +48498,10 @@ echo "${ECHO_T}found in $ac_find_includes" >&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;}
 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"
+           cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_WEBKIT 0
+_ACEOF
+

        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; }


@@ -48531,7 +48537,10 @@ echo "${ECHO_T}found in $ac_find_includes" >&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;}
 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"
+           cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_WEBKIT 0
+_ACEOF
+

        fi
    fi
 
        fi
    fi
 


@@ -48597,7 +48606,10 @@ else
 
                            { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&5
 echo "$as_me: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&2;}
 
                            { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&5
 echo "$as_me: WARNING: WebKit headers not found; disabling wxWebView WebKit" >&2;}

-                           wxUSE_WEBVIEW_WEBKIT=no
+                           cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_WEBKIT 0
+_ACEOF
+

 
 fi
 
 
 fi
 


@@ -48609,7 +48621,10 @@ fi
 _ACEOF
 
     else
 _ACEOF
 
     else

-        wxUSE_WEBVIEW_WEBKIT=no
+        cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WEBVIEW_WEBKIT 0
+_ACEOF
+

     fi
 fi
 
     fi
 fi
 

diff --git a/configure.in b/configure.in
index 54811fc1a48292a2a20a80647236a7ce140c019a..6013fb588bcff3f81d452ddbc4d83ff08b07abab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7386,7 +7386,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
        else
            AC_MSG_RESULT([no])
            AC_MSG_WARN([libwebkitgtk-1.0 not found; disabling webkit backend])
        else
            AC_MSG_RESULT([no])
            AC_MSG_WARN([libwebkitgtk-1.0 not found; disabling webkit backend])

-           wxUSE_WEBVIEW_WEBKIT="no"
+           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)

        fi
 
        AC_MSG_CHECKING(for webkitgtk includes)
        fi
 
        AC_MSG_CHECKING(for webkitgtk includes)


@@ -7398,7 +7398,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
        else
            AC_MSG_RESULT([not found])
            AC_MSG_WARN([webkit includes not found; disabling webkit backend])
        else
            AC_MSG_RESULT([not found])
            AC_MSG_WARN([webkit includes not found; disabling webkit backend])

-           wxUSE_WEBVIEW_WEBKIT="no"
+           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)

        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)


@@ -7410,7 +7410,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
        else
            AC_MSG_RESULT([not found])
            AC_MSG_WARN([libsoup includes not found; disabling webkit backend])
        else
            AC_MSG_RESULT([not found])
            AC_MSG_WARN([libsoup includes not found; disabling webkit backend])

-           wxUSE_WEBVIEW_WEBKIT="no"
+           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)

        fi
    fi
 
        fi
    fi
 


@@ -7424,7 +7424,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
                         ],
                         [
                            AC_MSG_WARN([WebKit headers not found; disabling wxWebView WebKit])
                         ],
                         [
                            AC_MSG_WARN([WebKit headers not found; disabling wxWebView WebKit])

-                           wxUSE_WEBVIEW_WEBKIT=no
+                           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)

                         ],
                         [
                            #include <Carbon/Carbon.h>
                         ],
                         [
                            #include <Carbon/Carbon.h>


@@ -7434,7 +7434,7 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
     elif test "$wxUSE_OLD_COCOA" = 1; then
         AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
     else
     elif test "$wxUSE_OLD_COCOA" = 1; then
         AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
     else

-        wxUSE_WEBVIEW_WEBKIT=no
+        AC_DEFINE(wxUSE_WEBVIEW_WEBKIT, 0)

     fi
 fi
 
     fi
 fi