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

Fix WebKit detection in configure under Mac after the last commit

Browse Source 
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.
This commit is contained in:
Vadim Zeitlin 2019-10-08 16:13:54 +02:00
parent b8fbecc261
commit 4e5095e5a5
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -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

10
configure.in
View File

@ -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