Only define wxUSE_WEBVIEW if wxWebView is really available.

Don't define wxUSE_WEBVIEW in configure if WebKit is not available under Unix
(we should also check for wxUSE_WEBVIEW_IE under Windows later) and add the
check that either wxUSE_WEBVIEW_WEBKIT or wxUSE_WEBVIEW_IE is defined if
wxUSE_WEBVIEW is to wx/chkconf.h.

This makes it possible to just check for wxUSE_WEBVIEW instead of checking for
wxUSE_WEBVIEW && (wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_WEBKIT) as the code did
previously which was ugly and error-prone.

Also, define wxUSE_WEBVIEW_IE in configure under MSW. Currently this supposes
that the required IE headers/libraries are available which is probably wrong,
we should add checks for them later.

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

configure

@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 69077 2011-09-13 12:06:06Z SJL .
+# From configure.in Id.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.3.
 #
@@ -1799,11 +1799,11 @@ 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
@@ -9412,50 +9412,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
@@ -9632,6 +9588,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}-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
@@ -48405,18 +48405,11 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
-USE_WEBVIEW=0
 if test "$wxUSE_WEBVIEW" = "yes"; then
-   cat >>confdefs.h <<\_ACEOF
+    USE_WEBVIEW_WEBKIT=0
-#define wxUSE_WEBVIEW 1
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
-_ACEOF
+        if test "$wxUSE_GTK" = 1; then
-
+            { echo "$as_me:$LINENO: checking for webkitgtk libraries" >&5
-   USE_WEBVIEW=1
-   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
-
-   if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$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=
@@ -48430,7 +48423,7 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
     done
   done
 
-       if test "$ac_find_libraries" != "" ; then
+            if test "$ac_find_libraries" != "" ; then
 
     if test "$ac_find_libraries" = "default location"; then
     ac_path_to_link=""
@@ -48444,15 +48437,15 @@ echo $ECHO_N "checking for webkitgtk libraries... $ECHO_C" >&6; }
     fi
   fi
 
-           if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                if test "$ac_path_to_link" != " -L/usr/lib" ; then
-               LDFLAGS="$LDFLAGS $ac_path_to_link"
+                    LDFLAGS="$LDFLAGS $ac_path_to_link"
-           fi
+                fi
-           GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
-           { echo "$as_me:$LINENO: result: yes" >&5
+                { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
-           { echo "$as_me:$LINENO: checking for webkitgtk includes" >&5
+                { echo "$as_me:$LINENO: checking for webkitgtk headers" >&5
-echo $ECHO_N "checking for webkitgtk includes... $ECHO_C" >&6; }
+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
@@ -48463,37 +48456,7 @@ for ac_dir in $SEARCH_INCLUDE /usr/include/webkit-1.0 /usr/include
     fi
   done
 
-           if test "$ac_find_includes" != "" ; then
+                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 includes" >&5
-echo $ECHO_N "checking for libsoup includes... $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; }
 
@@ -48511,35 +48474,59 @@ echo "${ECHO_T}found in $ac_find_includes" >&6; }
 
                    CPPFLAGS="$ac_path_to_include $CPPFLAGS"
 
-                   #if we have all the requirements then enable this backend
+                                      { echo "$as_me:$LINENO: checking for libsoup headers" >&5
-                   cat >>confdefs.h <<\_ACEOF
+echo $ECHO_N "checking for libsoup headers... $ECHO_C" >&6; }
-#define wxUSE_WEBVIEW_WEBKIT 1
-_ACEOF
 
-               else
+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: libsoup headers not found; disabling webkit backend" >&5
+                   { echo "$as_me:$LINENO: WARNING: WebKit headers not found; disabling WebKit backend" >&5
-echo "$as_me: WARNING: libsoup headers not found; disabling webkit backend" >&2;}
+echo "$as_me: WARNING: WebKit headers not found; disabling WebKit backend" >&2;}
-               fi
+                fi
-           else
+            else
-               { echo "$as_me:$LINENO: result: not found" >&5
+                { echo "$as_me:$LINENO: result: no" >&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:$LINENO: WARNING: WebKit libraries not found; disabling WebKit backend" >&5
-echo "$as_me: WARNING: webkit libraries not found; disabling webkit backend" >&2;}
+echo "$as_me: WARNING: WebKit libraries not found; disabling WebKit backend" >&2;}
-       fi
+            fi
-   fi
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
-
+                                    old_CPPFLAGS="$CPPFLAGS"
-    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+            CPPFLAGS="-x objective-c++ $CPPFLAGS"
-        old_CPPFLAGS="$CPPFLAGS"
+            { echo "$as_me:$LINENO: checking for WebKit/HIWebView.h" >&5
-        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
@@ -48551,8 +48538,8 @@ cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-                           #include <Carbon/Carbon.h>
+                                #include <Carbon/Carbon.h>
-                           #include <WebKit/WebKit.h>
+                                #include <WebKit/WebKit.h>
 
 
 #include <WebKit/HIWebView.h>
@@ -48588,22 +48575,53 @@ fi
 echo "${ECHO_T}$ac_cv_header_WebKit_HIWebView_h" >&6; }
 if test $ac_cv_header_WebKit_HIWebView_h = yes; then
 
-                           cat >>confdefs.h <<\_ACEOF
+                                USE_WEBVIEW_WEBKIT=1
-#define wxUSE_WEBVIEW_WEBKIT 1
+                                WEBKIT_LINK="-framework WebKit"
-_ACEOF
-
-                           WEBKIT_LINK="-framework WebKit"
 
 else
 
-                           { echo "$as_me:$LINENO: WARNING: webkit headers not found; disabling webkit backend" >&5
+                                { echo "$as_me:$LINENO: WARNING: WebKit headers not found" >&5
-echo "$as_me: WARNING: webkit headers not found; disabling webkit backend" >&2;}
+echo "$as_me: WARNING: WebKit headers not found" >&2;}
 
 fi
 
 
-        CPPFLAGS="$old_CPPFLAGS"
+            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
 
 

configure.in

@@ -845,11 +845,11 @@ WX_ARG_FEATURE(mdi,         [  --enable-mdi            use multiple document int
 WX_ARG_FEATURE(mdidoc,      [  --enable-mdidoc         use docview architecture with MDI], wxUSE_MDI_ARCHITECTURE)
 WX_ARG_FEATURE(mediactrl,   [  --enable-mediactrl      use wxMediaCtrl class], wxUSE_MEDIACTRL)
 WX_ARG_FEATURE(gstreamer8,  [  --enable-gstreamer8     force GStreamer 0.8 instead of 0.10 with the wxMediaCtrl class on unix], wxUSE_GSTREAMER8)
-WX_ARG_FEATURE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac)], wxUSE_WEBKIT)
 WX_ARG_FEATURE(richtext,    [  --enable-richtext       use wxRichTextCtrl], wxUSE_RICHTEXT)
 WX_ARG_FEATURE(postscript,  [  --enable-postscript     use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
 WX_ARG_FEATURE(printarch,   [  --enable-printarch      use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
 WX_ARG_FEATURE(svg,         [  --enable-svg            use wxSVGFileDC device context], wxUSE_SVG)
+WX_ARG_FEATURE(webkit,      [  --enable-webkit         use wxWebKitCtrl (Mac-only, use wxWebView instead)], wxUSE_WEBKIT)
 WX_ARG_FEATURE(webview,     [  --enable-webview        use wxWebView library], wxUSE_WEBVIEW)
 
 dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
@@ -7366,72 +7366,93 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
 fi
 
-USE_WEBVIEW=0
 if test "$wxUSE_WEBVIEW" = "yes"; then
-   AC_DEFINE(wxUSE_WEBVIEW)
+    USE_WEBVIEW_WEBKIT=0
-   USE_WEBVIEW=1
+    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes"; then
-   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+        if test "$wxUSE_GTK" = 1; then
-
+            AC_MSG_CHECKING([for webkitgtk libraries])
-   if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
+            WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
-
+            if test "$ac_find_libraries" != "" ; then
-       AC_MSG_CHECKING([for webkitgtk libraries])
+                WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-       WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0)
+                if test "$ac_path_to_link" != " -L/usr/lib" ; then
-       if test "$ac_find_libraries" != "" ; then
+                    LDFLAGS="$LDFLAGS $ac_path_to_link"
-           WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                fi
-           if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
-               LDFLAGS="$LDFLAGS $ac_path_to_link"
+                AC_MSG_RESULT([yes])
-           fi
-           GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwebkitgtk-1.0"
-           AC_MSG_RESULT([yes])
            
-           AC_MSG_CHECKING(for webkitgtk includes)
+                AC_MSG_CHECKING(for webkitgtk headers)
-           WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h)
+                WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h)
-           if test "$ac_find_includes" != "" ; then
+                if test "$ac_find_includes" != "" ; then
-               AC_MSG_RESULT(found in $ac_find_includes)
-               WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
-               CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-               
-               dnl we also depend on libsoup
-               AC_MSG_CHECKING(for libsoup includes)
-               WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h)
-               if test "$ac_find_includes" != "" ; then
                    AC_MSG_RESULT(found in $ac_find_includes)
                    WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
                    CPPFLAGS="$ac_path_to_include $CPPFLAGS"
                    
-                   #if we have all the requirements then enable this backend
+                   dnl we also depend on libsoup
-                   AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+                   AC_MSG_CHECKING(for libsoup headers)
-               else
+                   WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h)
-                   AC_MSG_RESULT([not found])
+                   if test "$ac_find_includes" != "" ; then
-                   AC_MSG_WARN([libsoup headers not found; disabling webkit backend])
+                       AC_MSG_RESULT(found in $ac_find_includes)
-               fi
+                       WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
-           else
+                       CPPFLAGS="$ac_path_to_include $CPPFLAGS"
-               AC_MSG_RESULT([not found])
-               AC_MSG_WARN([webkit headers not found; disabling webkit backend])
-           fi
-       else
-           AC_MSG_RESULT([no])
-           AC_MSG_WARN([webkit libraries not found; disabling webkit backend])
-       fi
-   fi
 
-    if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+                       USE_WEBVIEW_WEBKIT=1
-        old_CPPFLAGS="$CPPFLAGS"
+                   else
-        CPPFLAGS="-x objective-c++ $CPPFLAGS"
+                       AC_MSG_RESULT([not found])
-        AC_CHECK_HEADER([WebKit/HIWebView.h],
+                       AC_MSG_WARN([libsoup headers not found; disabling WebKit backend])
-                        [
+                   fi
-                           AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+                else
-                           WEBKIT_LINK="-framework WebKit"
+                   AC_MSG_RESULT([not found])
-                        ],
+                   AC_MSG_WARN([WebKit headers not found; disabling WebKit backend])
-                        [
+                fi
-                           AC_MSG_WARN([webkit headers not found; disabling webkit backend])
+            else
-                        ],
+                AC_MSG_RESULT([no])
-                        [
+                AC_MSG_WARN([WebKit libraries not found; disabling WebKit backend])
-                           #include <Carbon/Carbon.h>
+            fi
-                           #include <WebKit/WebKit.h>
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
-                        ])
+            dnl Under Mac we always have the libraries but check for the
-        CPPFLAGS="$old_CPPFLAGS"
+            dnl headers
+            old_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="-x objective-c++ $CPPFLAGS"
+            AC_CHECK_HEADER([WebKit/HIWebView.h],
+                            [
+                                USE_WEBVIEW_WEBKIT=1
+                                WEBKIT_LINK="-framework WebKit"
+                            ],
+                            [
+                                AC_MSG_WARN([WebKit headers not found])
+                            ],
+                            [
+                                #include <Carbon/Carbon.h>
+                                #include <WebKit/WebKit.h>
+                            ])
+            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"
+            AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)
+        else
+            AC_MSG_WARN([WebKit not available, disabling wxWebView])
+        fi
+    elif test "$wxUSE_MSW" = 1; then
+        if test "wxUSE_WEBVIEW_IE" = "yes"; then
+            dnl TODO: Check for the required headers/libraries under Windows
+            dnl       too and do the right thing automatically there too.
+            wxUSE_WEBVIEW="yes"
+            AC_DEFINE(wxUSE_WEBVIEW_IE)
+        fi
+    fi
+fi
+
+if test "$wxUSE_WEBVIEW" = "yes"; then
+    USE_WEBVIEW=1
+    AC_DEFINE(wxUSE_WEBVIEW)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
+else
+    USE_WEBVIEW=0
 fi
 
 dnl ---------------------------------------------------------------------------

include/wx/chkconf.h

@@ -2154,6 +2154,15 @@
 #   endif
 #endif /* wxUSE_TREELISTCTRL */
 
+#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#   ifdef wxABORT_ON_CONFIG_ERROR
+#       error "wxUSE_WEBVIEW requires at least one backend"
+#   else
+#       undef wxUSE_WEBVIEW
+#       define wxUSE_WEBVIEW 0
+#   endif
+#endif /* wxUSE_WEBVIEW && !any web view backend */
+
 #endif /* wxUSE_GUI */
 
 #endif /* _WX_CHKCONF_H_ */

include/wx/webview.h

@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#if wxUSE_WEBVIEW
 
 #include "wx/control.h"
 #include "wx/event.h"
@@ -230,6 +230,6 @@ typedef void (wxEvtHandler::*wxWebViewEventFunction)
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \
                      wxWebViewEventHandler(fn))
 
-#endif // wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#endif // wxUSE_WEBVIEW
 
 #endif // _WX_WEB_VIEW_H_

include/wx/webviewarchivehandler.h

@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#if wxUSE_WEBVIEW
 
 class wxFSFile;
 class wxFileSystem;
@@ -32,6 +32,6 @@ private:
     wxFileSystem* m_fileSystem;
 };
 
-#endif // wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#endif // wxUSE_WEBVIEW
 
 #endif // _WX_WEB_VIEW_FILE_HANDLER_H_

src/common/webview.cpp

@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#if wxUSE_WEBVIEW
 
 #if defined(__BORLANDC__)
     #pragma hdrstop
@@ -112,4 +112,4 @@ wxWebView* wxWebView::New(wxWindow* parent,
     }
 }
 
-#endif // wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#endif // wxUSE_WEBVIEW

src/common/webviewarchivehandler.cpp

@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#if wxUSE_WEBVIEW
 
 #if defined(__BORLANDC__)
     #pragma hdrstop
@@ -110,4 +110,4 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
     }
 }
 
-#endif // wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#endif // wxUSE_WEBVIEW