Commit | Line | Data |
---|---|---|
77d7bbf4 RG |
1 | From 6d512b5c4d774a9853b51dae464a10cea7e3423a Mon Sep 17 00:00:00 2001 |
2 | From: Peter Rustler <peter.rustler@basyskom.com> | |
3 | Date: Mon, 7 Dec 2015 11:40:05 +0000 | |
4 | Subject: [PATCH] Add support for new webkit version 4.0 to build system | |
5 | ||
6 | Add new configure value for option --with-webkit. | |
7 | Now you can add 4.0 as value to --with-webkit. | |
8 | Default is still 3.0. | |
9 | ||
10 | https://bugzilla.gnome.org/show_bug.cgi?id=759171 | |
11 | --- | |
12 | configure.ac | 10 ++++++++-- | |
13 | 1 file changed, 8 insertions(+), 2 deletions(-) | |
14 | ||
15 | diff --git a/configure.ac b/configure.ac | |
16 | index 2313c093..3d5d4823 100644 | |
17 | --- a/configure.ac | |
18 | +++ b/configure.ac | |
19 | @@ -77,12 +77,12 @@ dnl ==============================WebKit======================================= | |
20 | m4_define([webkit_default], [3.0]) | |
21 | ||
22 | AC_ARG_WITH([webkit], | |
23 | - [AC_HELP_STRING([--with-webkit=@<:@3.0/1.0@:>@], | |
24 | + [AC_HELP_STRING([--with-webkit=@<:@4.0/3.0/1.0@:>@], | |
25 | [Select the Webkit backend, default=3.0])], | |
26 | [], | |
27 | [with_webkit=webkit_default]) | |
28 | ||
29 | -dnl=== support both 1.0 and 3.0 (default 3.0) == | |
30 | +dnl=== support all 1.0, 3.0 and 4.0 (default 3.0) == | |
31 | AS_CASE([$with_webkit], | |
32 | [3.0], [ | |
33 | WEBKIT_PC=webkitgtk-3.0 | |
34 | @@ -90,6 +90,12 @@ AS_CASE([$with_webkit], | |
35 | AC_CHECK_LIB(webkitgtk-3.0, JSContextGroupCreate,, | |
36 | AC_CHECK_LIB(javascriptcoregtk-3.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-3.0)) | |
37 | ], | |
38 | + [4.0], [ | |
39 | + WEBKIT_PC=webkitgtk-4.0 | |
40 | + SEED_GTK_VERSION=-gtk4 | |
41 | + AC_CHECK_LIB(webkitgtk-4.0, JSContextGroupCreate,, | |
42 | + AC_CHECK_LIB(javascriptcoregtk-4.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-4.0)) | |
43 | + ], | |
44 | [1.0], [ | |
45 | AC_CHECK_LIB(webkitgtk-1.0, JSContextGroupCreate,WEBKIT_PC=webkitgtk-1.0, | |
46 | AC_CHECK_LIB(javascriptcoregtk-1.0, JSContextGroupCreate,WEBKIT_PC=javascriptcoregtk-1.0, | |
47 | -- | |
48 | GitLab | |
49 |