From 4e5095e5a5090dd025efd9f8818e69e50ea68f67 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 8 Oct 2019 16:13:54 +0200
Subject: [PATCH] Fix WebKit detection in configure under Mac after the last
 commit

The last commit accidentally removed not only the checks, but also the
actions executed when the check was successful -- restore the former
while still removing the latter.
---
 configure    |  9 ++++++++-
 configure.in | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 0426df54c9..7e83754c38 100755
--- a/configure
+++ b/configure
@@ -36336,7 +36336,11 @@ if test "$wxUSE_HTML" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
 fi
 if test "$wxUSE_WEBKIT" = "yes"; then
-        if test "$wxUSE_MAC" != 1 -a "$USE_DARWIN" != 1; then
+    if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+        $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h
+
+        WEBKIT_LINK="-framework WebKit"
+    else
         wxUSE_WEBKIT=no
     fi
     if test "$wxUSE_WEBKIT" = "yes"; then
@@ -36663,6 +36667,9 @@ $as_echo "yes" >&6; }
 
 fi
             fi
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+                        USE_WEBVIEW_WEBKIT=1
+            WEBKIT_LINK="-framework WebKit"
         fi
     fi
 
diff --git a/configure.in b/configure.in
index 4a05cc5efe..f361e85fda 100644
--- a/configure.in
+++ b/configure.in
@@ -7136,8 +7136,10 @@ if test "$wxUSE_HTML" = "yes"; then
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
 fi
 if test "$wxUSE_WEBKIT" = "yes"; then
-    dnl This is only supported under Mac.
-    if test "$wxUSE_MAC" != 1 -a "$USE_DARWIN" != 1; then
+    if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+        AC_DEFINE(wxUSE_WEBKIT)
+        WEBKIT_LINK="-framework WebKit"
+    else
         wxUSE_WEBKIT=no
     fi
     if test "$wxUSE_WEBKIT" = "yes"; then
@@ -7275,6 +7277,10 @@ if test "$wxUSE_WEBVIEW" = "yes"; then
                                     AC_MSG_WARN([webkitgtk not found.])
                                   ])
             fi
+        elif test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
+            dnl Under Mac we always have the libraries
+            USE_WEBVIEW_WEBKIT=1
+            WEBKIT_LINK="-framework WebKit"
         fi
     fi