[epiphany] Remove enable_gsb meson option
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove enable_gsb meson option
- Date: Thu, 7 Jan 2021 21:02:13 +0000 (UTC)
commit a863f121cbbbada1325b0561521b1f60e8bba4ee
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Thu Jan 7 14:58:02 2021 -0600
Remove enable_gsb meson option
This should be a feature option, not a bool option.
Anyway, it doesn't matter, since it's redundant with the API key option.
meson.build | 5 +----
meson_options.txt | 8 --------
2 files changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/meson.build b/meson.build
index 593fcec32..2ef46a8b3 100644
--- a/meson.build
+++ b/meson.build
@@ -70,10 +70,7 @@ conf.set_quoted('VERSION', '@VCS_TAG@')
gsb_api_key = get_option('gsb_api_key')
conf.set_quoted('GSB_API_KEY', gsb_api_key)
-if gsb_api_key != ''
- message('GSB API Key provided')
-endif
-conf.set10('ENABLE_GSB', get_option('enable_gsb'))
+conf.set10('ENABLE_GSB', gsb_api_key != '')
glib_requirement = '>= 2.61.2'
gtk_requirement = '>= 3.24.0'
diff --git a/meson_options.txt b/meson_options.txt
index cd83fcdca..dc59c0b78 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -34,16 +34,8 @@ option('unit_tests',
description: 'Enable unit tests'
)
-option('enable_gsb',
- type: 'boolean',
- value: false,
- description: 'Enable Google Safe Browsing support'
-)
-
option('gsb_api_key',
type: 'string',
value: '',
description: 'The API key used to access the Google Safe Browsing API v4'
)
-
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]