[balsa] Replace 'yes'|'no' values with 'true'|'false'

[Peter Bloomfield <peterb src gnome org>]

commit 5d9e830d99c31e3280b1f57b2e98f5c003bc10f1
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Sep 21 20:19:16 2017 -0400

    Replace 'yes'|'no' values with 'true'|'false'
    
        Replace 'yes'|'no' option values inherited from autotools with
        'true'|'false' string values.
    
        * libbalsa/meson.build:
        * meson.build:
        * meson_options.txt:

 ChangeLog            |    9 +++++++++
 libbalsa/meson.build |    2 +-
 meson.build          |   41 +++++++++++++++++------------------------
 meson_options.txt    |   20 ++++++++++----------
 4 files changed, 37 insertions(+), 35 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d626395..22065c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2017-09-21  Peter Bloomfield  <pbloomfield bellsouth net>
 
+       Replace 'yes'|'no' option values inherited from autotools with
+       'true'|'false' string values.
+
+       * libbalsa/meson.build:
+       * meson.build:
+       * meson_options.txt:
+
+2017-09-21  Peter Bloomfield  <pbloomfield bellsouth net>
+
        * sounds/meson.build: make an absolute path to the po dir.
 
 2017-09-20  Peter Bloomfield  <pbloomfield bellsouth net>
diff --git a/libbalsa/meson.build b/libbalsa/meson.build
index cf9d010..9f49ab4 100644
--- a/libbalsa/meson.build
+++ b/libbalsa/meson.build
@@ -1,6 +1,6 @@
 # libbalsa/meson.build
 
-if gpgmecfg == 'yes'
+if gpgmecfg == 'true'
   libbalsa_gpgme_extra = [
     'libbalsa-gpgme.h',
     'libbalsa-gpgme.c',
diff --git a/meson.build b/meson.build
index fb70a68..fcf3663 100644
--- a/meson.build
+++ b/meson.build
@@ -235,7 +235,7 @@ endif
 
 # GPGME detection.
 
-if gpgmecfg == 'yes'
+if gpgmecfg == 'true'
   gpgmecfg_program = find_program('gpgme-config', required : false)
   if not gpgmecfg_program.found()
     error('GPGme build requested but gpgme-config program not found.')
@@ -243,10 +243,10 @@ if gpgmecfg == 'yes'
   gpgmecfg = gpgmecfg_program.path()
 endif
 
-if gpgmecfg != 'no'
+if gpgmecfg != 'false'
   gpgmever = run_command(gpgmecfg, '--version').stdout().strip()
   if gpgmever.version_compare('< 1.2.0')
-    gpgmecfg   = 'no'
+    gpgmecfg   = 'false'
     message('Sorry, you need at least gpgme version 1.2.0')
   else
     if gpgmever.version_compare('< 1.8.0')
@@ -272,16 +272,16 @@ if gpgmecfg != 'no'
     conf.set('HAVE_GPGME', 1,
              description : 'Defined when gpgme is available.')
     balsa_deps += gpgme_dep
-    gpgmecfg = 'yes'
+    gpgmecfg = 'true'
   endif
 endif
 
 # OpenLDAP configuration.
 #
-if with_ldap != 'no'
+if with_ldap != 'false'
   ldap_compile_args = []
   ldap_link_args    = ['-lldap', '-llber', '-lresolv']
-  if with_ldap != 'yes'
+  if with_ldap != 'true'
     ldap_compile_args += '-I' + with_ldap + '/include'
     ldap_link_args    += '-L' + with_ldap + '/lib'
   endif
@@ -304,11 +304,11 @@ if with_ldap != 'no'
                                 link_args    : ldap_link_args)
   balsa_deps += ldap_dep
   balsa_ab_deps += ldap_dep
-endif # with_ldap != 'no'
+endif # with_ldap != 'false'
 
 # SQLite configuration.
 #
-if with_sqlite != 'no'
+if with_sqlite != 'false'
   sqlite_dep = dependency('sqlite3', required : false)
   if sqlite_dep.found()
     conf.set('HAVE_SQLITE3', 1,
@@ -319,7 +319,7 @@ if with_sqlite != 'no'
   conf.set('HAVE_SQLITE', 1,
     description : 'If defined, enable GPE address book support.')
 
-  if with_sqlite != 'yes'
+  if with_sqlite != 'true'
     # If sqlite is installed in a nonstandard location, PKG_CONFIG_PATH
     # would probably need to be set appropriately in the environment.
     # There doesn't seem to be a way to do that within dependency().
@@ -332,7 +332,7 @@ if with_sqlite != 'no'
 
   balsa_deps += real_dep
   balsa_ab_deps += real_dep
-endif # with_sqlite != 'no'
+endif # with_sqlite != 'false'
 
 # Rubrica (libxml2) configuration
 #
@@ -447,10 +447,10 @@ endif # with_gcr
 
 # Compface configuration
 #
-if with_compface != 'no'
+if with_compface != 'false'
   compface_compile_args = []
   compface_link_args    = ['-lcompface']
-  if with_compface != 'yes'
+  if with_compface != 'true'
     compface_compile_args += '-I' + with_compface + '/include'
     compface_link_args    += '-L' + with_compface + '/lib'
   endif
@@ -466,7 +466,7 @@ if with_compface != 'no'
   compface_dep = declare_dependency(compile_args : compface_compile_args,
                                     link_args    : compface_link_args)
   balsa_deps += compface_dep
-endif # with_compface != 'no'
+endif # with_compface != 'false'
 
 # GtkSourceView configuration
 #
@@ -523,28 +523,21 @@ if spell_checker == 'gspell'
       description : 'Defined when Gspell API is version 1.2.')
   endif
 elif spell_checker == 'gtkspell'
-  spell_dep = dependency('gtkspell3-3.0',
-                         version  : '>= 3.0.3',
-                         required : false)
-  if spell_dep.found()
+  spell_dep = dependency('gtkspell3-3.0')
+  if spell_dep.version().version_compare('>= 3.0.3')
     conf.set('HAVE_GTKSPELL_3_0_3', 1,
       description : 'Defined when GtkSpell version is at least 3.0.3.')
   else
-    spell3_dep = dependency('gtkspell3-3.0')
     enchant_dep = dependency('enchant')
-    spell_dep = declare_dependency(dependencies : [spell3_dep, enchant_dep])
+    spell_dep = [spell_dep, enchant_dep]
   endif
   conf.set('HAVE_GTKSPELL', 1,
     description : 'Defined when GtkSpell can be used.')
 elif spell_checker == 'internal'
   spell_dep = dependency('enchant')
-elif spell_checker != 'no'
-  error('bad option' + spell_checker)
 endif
 
-if is_variable('spell_dep')
-  balsa_deps += spell_dep
-endif
+balsa_deps += spell_dep
 
 #####################################################################
 # Typedefs, structures and compiler characteristics.
diff --git a/meson_options.txt b/meson_options.txt
index 785012b..c35077e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -20,8 +20,8 @@ option('enable-debug-threads',
 
 option('with-gpgme',
   type        : 'string',
-  value       : 'no',
-  description : 'build with gpgme/GnuPG support (yes|no|path to gpgme-config, default=no)')
+  value       : 'false',
+  description : 'build with gpgme/GnuPG support (true|false|path to gpgme-config, default=false)')
 
 option('with-canberra',
   type        : 'boolean',
@@ -30,8 +30,8 @@ option('with-canberra',
 
 option('with-compface',
   type        : 'string',
-  value       : 'no',
-  description : 'Enable Compface (yes|no|path to compface installation, default=no)')
+  value       : 'false',
+  description : 'Enable Compface (true|false|path to compface installation, default=false)')
 
 option('with-gss',
   type        : 'boolean',
@@ -57,8 +57,8 @@ option('with-spell-checker',
 
 option('with-ldap',
   type        : 'string',
-  value       : 'no',
-  description : 'Use OpenLDAP if available (yes|no|path to LDAP installation, default=no)')
+  value       : 'false',
+  description : 'Use OpenLDAP if available (true|false|path to LDAP installation, default=false)')
 
 option('with-libnotify',
   type        : 'boolean',
@@ -68,7 +68,7 @@ option('with-libnotify',
 option('with-macosx-desktop',
   type        : 'boolean',
   value       : false,
-  description : 'Use Mac OS X Desktop Integration (default=no, extremely experimental)')
+  description : 'Use Mac OS X Desktop Integration (default=false, extremely experimental)')
 
 option('with-rubrica',
   type        : 'boolean',
@@ -78,12 +78,12 @@ option('with-rubrica',
 option('with-osmo',
   type        : 'boolean',
   value       : false,
-  description : 'add Osmo address book support (experimental, needs osmo > svn rev. 1099, default=no)')
+  description : 'add Osmo address book support (experimental, needs osmo > svn rev. 1099, default=false)')
 
 option('with-sqlite',
   type        : 'string',
-  value       : 'no',
-  description : 'Use SQLite for GPE address books (yes|no|path to SQLite installation, default=no)')
+  value       : 'false',
+  description : 'Use SQLite for GPE address books (true|false|path to SQLite installation, default=false)')
 
 option('with-libsecret',
   type        : 'boolean',