emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

emacs-29 7287b7b53a: Support webkit2gtk-4.1


From: Ulrich Müller
Subject: emacs-29 7287b7b53a: Support webkit2gtk-4.1
Date: Sun, 12 Feb 2023 04:40:16 -0500 (EST)

branch: emacs-29
commit 7287b7b53a17f9b2d1b474466106806a9d57af47
Author: Ulrich Müller <ulm@gentoo.org>
Commit: Ulrich Müller <ulm@gentoo.org>

    Support webkit2gtk-4.1
    
    * configure.ac: Check for webkit2gtk API version 4.1 first, then
    fall back to 4.0.
---
 configure.ac | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 645082c974..bc7e61048c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3613,8 +3613,12 @@ XWIDGETS_OBJ=
 if test "$with_xwidgets" != "no"; then
   if test "$USE_GTK_TOOLKIT" = "GTK3" && test "$window_system" != "none"; then
     WEBKIT_REQUIRED=2.12
-    WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
+    WEBKIT_MODULES="webkit2gtk-4.1 >= $WEBKIT_REQUIRED"
     EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
+    if test "$HAVE_WEBKIT" = "no"; then
+      WEBKIT_MODULES="webkit2gtk-4.0 >= $WEBKIT_REQUIRED"
+      EMACS_CHECK_MODULES([WEBKIT], [$WEBKIT_MODULES])
+    fi
     HAVE_XWIDGETS=$HAVE_WEBKIT
     XWIDGETS_OBJ="xwidget.o"
     if test "$HAVE_X_WINDOWS" = "yes" && test "${with_cairo}" = "no"; then



reply via email to

[Prev in Thread] Current Thread [Next in Thread]