[Commits] [SCM] claws branch, master, updated. 4.1.1-45-g568c901bc

[paul at claws-mail.org]

The branch, master has been updated
       via  568c901bca98f54d98de89d7bd8f3acdc2cc20af (commit)
      from  914102789bbf9b6f333bc94d7041ff836ccb9585 (commit)

Summary of changes:
 configure.ac | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit 568c901bca98f54d98de89d7bd8f3acdc2cc20af
Author: Paul <paul at claws-mail.org>
Date:   Fri Feb 24 09:25:29 2023 +0000

    fix bug 4666, 'fancy plugin doesn't build with libwebkit2gtk-4.1'

diff --git a/configure.ac b/configure.ac
index fdb7db51c..03a87b4d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1274,12 +1274,18 @@ AC_SUBST(EXPAT_CFLAGS)
 AC_SUBST(EXPAT_LIBS)
 
 dnl webkit *********************************************************************
-PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.1, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+if test x"$HAVE_WEBKIT" = xno; then
+	PKG_CHECK_MODULES(WEBKIT, webkit2gtk-4.0 >= 2.18.0, HAVE_WEBKIT=yes, HAVE_WEBKIT=no)
+fi
 AC_SUBST(WEBKIT_LIBS)
 AC_SUBST(WEBKIT_CFLAGS)
 
 dnl libsoup ********************************************************************
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+PKG_CHECK_MODULES(LIBSOUP, libsoup-3.0, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+if test x"$HAVE_LIBSOUP" = xno; then
+	PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, HAVE_LIBSOUP=yes, HAVE_LIBSOUP=no)
+fi
 if test x"$HAVE_LIBSOUP" = xyes; then
 	AC_DEFINE(HAVE_LIBSOUP, 1, [Define if libsoup is available])
 fi
@@ -1621,7 +1627,7 @@ if test x"$enable_fancy_plugin" != xno; then
 	dependencies_missing=""
 
 	if test x"$HAVE_WEBKIT" = xno; then
-		dependencies_missing="libwebkit2gtk-4.0 $dependencies_missing"
+		dependencies_missing="libwebkit2gtk-4.0 or greater $dependencies_missing"
 	fi
 	if test x"$HAVE_CURL" = xno; then
 		dependencies_missing="libcurl $dependencies_missing"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail