badwolf

commit: 0199df2a85269e4f7f759a75e7ad89fa7386a1a4
parent 5b0538f71c00c8a8275003308105a890ee9e6890
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Mon,  1 Nov 2021 13:17:34 +0100

configure: Pick libsoup2 instead of GUri with webkit2gtk-4.0

As seen in the parent commit GUri seems rather unwieldy regarding memory management.

Related: https://queer.hacktivis.me/objects/cec7c4e8-6a58-4358-85bf-b66f9bb21a98

Diffstat:
M
configure
14
+++++---------

1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/configure b/configure
@@ -192,20 +192,16 @@ case "${WITH_URI_PARSER}n" in
 	n)
 		echo "notice: Packagers should consider setting the URI parsing library (guri or libsoup2) in WITH_URI_PARSER" >&2
 
-		if pkg_config_check --atleast-version="${min_glib_guri}" glib-2.0
+		if echo "${DEPS}" | grep -q 'webkit2gtk-4.0'
 		then
-			echo "URI parser selected: GUri from glib-2.0"
-			DEPS="${DEPS} glib-2.0"
-		else
 			pkg_config_check libsoup-2.4 || exit 1
 			echo "URI parser selected: libsoup-2.4"
 			DEPS="${DEPS} libsoup-2.4"
 			CFLAGS="${CFLAGS} -DUSE_LIBSOUP2"
-
-			if echo "${DEPS}" | grep -q 'webkit2gtk-4.1'
-			then
-				echo 'warning: libsoup2 selected while WebKitGTK with libsoup3 API is used' >&2
-			fi
+		else
+			pkg_config_check --atleast-version="${min_glib_guri}" glib-2.0 || exit 1
+			echo "URI parser selected: GUri from glib-2.0"
+			DEPS="${DEPS} glib-2.0"
 		fi
 	;;
 	*)