[balsa] meson: Make 'autocrypt' a boolean option
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa] meson: Make 'autocrypt' a boolean option
- Date: Mon, 4 Feb 2019 21:27:57 +0000 (UTC)
commit c9748817520ad6266db44df6cd83585aa3e68fed
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Mon Feb 4 16:25:35 2019 -0500
meson: Make 'autocrypt' a boolean option
* meson_options.txt: make 'autocrypt' a boolean option, default
false;
* meson.build: rename 'autocryptcfg' to 'autocrypt', since it is
now boolean.
ChangeLog | 7 +++++++
meson.build | 6 +++---
meson_options.txt | 6 +++---
3 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7db303129..6e8e525cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-02-04 Peter Bloomfield <pbloomfield bellsouth net>
+
+ * meson_options.txt: make 'autocrypt' a boolean option, default
+ false;
+ * meson.build: rename 'autocryptcfg' to 'autocrypt', since it is
+ now boolean.
+
2019-02-03 Peter Bloomfield <pbloomfield bellsouth net>
Restore running the address book editor
diff --git a/meson.build b/meson.build
index a623bbafa..b41a1844b 100644
--- a/meson.build
+++ b/meson.build
@@ -47,7 +47,7 @@ endif
gnome_desktop = get_option('gnome-desktop')
gpgmecfg = get_option('gpgme')
-autocryptcfg = get_option('autocrypt')
+autocrypt = get_option('autocrypt')
canberra = get_option('canberra')
compface = get_option('compface')
gss = get_option('gss')
@@ -245,7 +245,7 @@ endif
# Autocrypt
if gpgmecfg != 'false'
- if autocryptcfg == 'true'
+ if autocrypt
autocrypt_dep = dependency('sqlite3', required : true)
if autocrypt_dep.found()
conf.set('ENABLE_AUTOCRYPT', 1, description : 'If defined, enable Autocrypt support.')
@@ -630,7 +630,7 @@ summary = [
' Use GNOME: @0@'.format(gnome_desktop),
' Use Canberra: @0@'.format(canberra),
' Use GPGME: @0@'.format(gpgmecfg),
- ' Use Autocrypt: @0@'.format(autocryptcfg),
+ ' Use Autocrypt: @0@'.format(autocrypt),
' Use LDAP: @0@'.format(ldap),
' Use GSS: @0@'.format(gss),
' Use SQLite: @0@'.format(sqlite),
diff --git a/meson_options.txt b/meson_options.txt
index d72c558a6..94d0f5fab 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -19,9 +19,9 @@ option('gpgme',
description : 'build with gpgme/GnuPG support (true|false|path to gpgme-config, default=false)')
option('autocrypt',
- type : 'string',
- value : 'false',
- description : 'build with Autocrypt support (see https://autocrypt.org/), default=no, requires gpgme and
sqlite3')
+ type : 'boolean',
+ value : false,
+ description : 'build with Autocrypt support (see https://autocrypt.org/), (default=false), requires gpgme
and sqlite3')
option('canberra',
type : 'boolean',
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]