[yelp/41-webkit2gtk-4-0-option: 2/2] Add temporary option to build against webkit2gtk-4.0




commit 47b0dc96dc0e82102600365b83353d7922f1a94d
Author: Shaun McCance <shaunm gnome org>
Date:   Sun Jul 25 10:54:00 2021 -0400

    Add temporary option to build against webkit2gtk-4.0

 configure.ac | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f6d5a402..3cc22de8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,6 +22,15 @@ AC_PROG_LN_S
 GLIB_GSETTINGS
 APPSTREAM_XML
 
+# Release team wants WebKitGTK 4.1 for the GNOME 41 release.
+# Shaun doesn't have a build environment with that yet.
+# Get rid of this option when that stops being true.
+AC_ARG_WITH([webkit2gtk-4-0],
+        AS_HELP_STRING([--with-webkit2gtk-4-0],
+        [Build against webkit2gtk-4.0 instead of webkit2gtk-4.1]),
+        [webkitdep="webkit2gtk-4.0 >= 2.19.2";webextdep="webkit2gtk-web-extension-4.0 >= 2.7.2"],
+        [webkitdep="webkit2gtk-4.1";webextdep="webkit2gtk-web-extension-4.1"])
+
 # Library dependecies
 LT_LIB_M
 PKG_CHECK_MODULES(YELP,
@@ -34,7 +43,7 @@ PKG_CHECK_MODULES(YELP,
        libxslt >= 1.1.4
        libexslt >= 0.8.1
        sqlite3
-       webkit2gtk-4.1
+        $webkitdep
        yelp-xsl >= 3.27.1
 ])
 AC_SUBST([YELP_CFLAGS])
@@ -45,7 +54,7 @@ AC_SUBST([YELP_LIBS])
 LT_PREREQ([2.2.6])
 LT_INIT
 
-PKG_CHECK_MODULES([YELP_EXTENSION], [webkit2gtk-web-extension-4.1])
+PKG_CHECK_MODULES([YELP_EXTENSION], [$webextdep])
 AC_SUBST(YELP_EXTENSION_CFLAGS)
 AC_SUBST(YELP_EXTENSION_LIBS)
 


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