[balsa] Allow installing the help files

[Peter Bloomfield <peterb src gnome org>]

commit 1c5431281fd67c100dbbb43c00560c0756831376
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Thu Sep 14 09:40:44 2017 -0400

    Allow installing the help files
    
        * meson.build:
        * src/meson.build:

 ChangeLog       |    7 ++++++
 doc/ChangeLog   |    6 +++++
 doc/meson.build |   62 ++++++++++++++++++++++++++++++++----------------------
 meson.build     |   14 ++++++------
 src/meson.build |    2 +-
 5 files changed, 58 insertions(+), 33 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fa94318..009375c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-14  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       Allow installing the help files
+
+       * meson.build:
+       * src/meson.build:
+
 2017-09-13  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Meson uses msgfmt rather than intltool-merge, so we do not use
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 9703bab..7eaf4b5 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2017-09-14  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       reviewed by: <delete if not using a buddy>
+
+       * meson.build:
+
 2017-08-06  Peter Bloomfield  <pbloomfield bellsouth net>
 
        Use Unicode quotation marks and ellipses, and mark some strings
diff --git a/doc/meson.build b/doc/meson.build
index c07fbca..e8eeee3 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -23,7 +23,6 @@ HELP_FILES   = [
                'preferences-mail-options.page',
                'preferences-miscellaneous.page',
                'preferences.page',
-              'preferences-spelling.page',
                'preferences-startup.page',
                'toolbar-prefs.page',
                'win-composer.page',
@@ -31,35 +30,48 @@ HELP_FILES   = [
                'win-main.page',
                'win-message.page',
                'win-run-filters.page',
-               'win-search.page',
+               'win-search.page'
                ]
 
-HELP_EXTRA   = 'balsa.entities'
+if spell_checker == 'internal'
+  HELP_FILES += 'preferences-spelling.page'
+endif
 
-HELP_MEDIA   = [
-             'figures/address-book-ldap.png',
-             'figures/address-book-modify.png',
-             'figures/address-book.png',
-             'figures/address-book-vcard.png',
-             'figures/balsa_logo.png',
-             'figures/druid-start.png',
-             'figures/example-alias.png',
-             'figures/figuresdobaaddress-book-modify.png',
-             'figures/main-window.png',
-             'figures/main-window-toolbar.png',
-             'figures/message-window.png',
-             'figures/msg-part-select.png',
-             'figures/newmsg-window-attachments.png',
-             'figures/newmsg-window.png',
-             'figures/newmsg-window-toolbar.png',
-             'figures/preferences-window.png',
-             'figures/spell-check.png',
-              ]
+HELP_EXTRA   = [
+               'balsa.entities'
+               ]
 
-files = [HELP_EXTRA]
-files += HELP_FILES
+HELP_MEDIA   = [
+               'figures/address-book-ldap.png',
+               'figures/address-book-modify.png',
+               'figures/address-book.png',
+               'figures/address-book-vcard.png',
+               'figures/balsa_logo.png',
+               'figures/druid-start.png',
+               'figures/example-alias.png',
+               'figures/figuresdobaaddress-book-modify.png',
+               'figures/main-window.png',
+               'figures/main-window-toolbar.png',
+               'figures/message-window.png',
+               'figures/msg-part-select.png',
+               'figures/newmsg-window-attachments.png',
+               'figures/newmsg-window.png',
+               'figures/newmsg-window-toolbar.png',
+               'figures/preferences-window.png',
+               'figures/spell-check.png'
+               ]
 
 gnome.yelp(HELP_ID,
-           sources   : files,
+           sources   : HELP_FILES,
            media     : HELP_MEDIA,
            languages : HELP_LINGUAS)
+
+# Ugly!
+# gnome.yelp needs '--extra : HELP_EXTRA' for included files
+#
+help_install_dir = join_paths(get_option('datadir'), 'help', 'C', 'balsa')
+
+foreach file : HELP_EXTRA
+  install_data(join_paths('C', file),
+               install_dir : help_install_dir)
+endforeach
diff --git a/meson.build b/meson.build
index bef337a..1c2b4ac 100644
--- a/meson.build
+++ b/meson.build
@@ -55,7 +55,7 @@ with_compface      = get_option('with-compface')
 with_gss           = get_option('with-gss')
 use_html_widget    = get_option('with-html-widget')
 with_gtksourceview = get_option('with-gtksourceview')
-use_spell_checker  = get_option('with-spell-checker')
+spell_checker      = get_option('with-spell-checker')
 with_ldap          = get_option('with-ldap')
 with_libnotify     = get_option('with-libnotify')
 use_igemacint      = get_option('with-macosx-desktop')
@@ -543,7 +543,7 @@ endif # with_libsecret
 
 # Spell check detection.
 #
-if use_spell_checker == 'gspell'
+if spell_checker == 'gspell'
   spell_dep = dependency('gspell-1')
   conf.set('HAVE_GSPELL', 1,
     description : 'Defined when Gspell can be used.')
@@ -551,7 +551,7 @@ if use_spell_checker == 'gspell'
     conf.set('HAVE_GSPELL_1_2', 1,
       description : 'Defined when Gspell API is version 1.2.')
   endif
-elif use_spell_checker == 'gtkspell'
+elif spell_checker == 'gtkspell'
   spell_dep = dependency('gtkspell3-3.0',
                          version  : '>= 3.0.3',
                          required : false)
@@ -565,10 +565,10 @@ elif use_spell_checker == 'gtkspell'
   endif
   conf.set('HAVE_GTKSPELL', 1,
     description : 'Defined when GtkSpell can be used.')
-elif use_spell_checker == 'internal'
+elif spell_checker == 'internal'
   spell_dep = dependency('enchant')
-elif use_spell_checker != 'no'
-  error('bad option' + use_spell_checker)
+elif spell_checker != 'no'
+  error('bad option' + spell_checker)
 endif
 
 if is_variable('spell_dep')
@@ -743,7 +743,7 @@ message('                 Use GPGME: ' + gpgmecfg)
 message('                  Use LDAP: ' + with_ldap)
 message('                   Use GSS: ' + (with_gss           ? 'true' : 'false'))
 message('                Use SQLite: ' + with_sqlite)
-message('             Spell checker: ' + use_spell_checker)
+message('             Spell checker: ' + spell_checker)
 message('             Use Libnotify: ' + (with_libnotify     ? 'true' : 'false'))
 message('         Use GtkSourceView: ' + (with_gtksourceview ? 'true' : 'false'))
 message('              Use Compface: ' + with_compface)
diff --git a/src/meson.build b/src/meson.build
index b9ad2d9..36bc383 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -90,7 +90,7 @@ balsa_print_source = [
   ]
 
 balsa_sources = balsa_base_srclist + balsa_print_source
-if use_spell_checker == 'internal'
+if spell_checker == 'internal'
   balsa_spell_extra = [
     'spell-check.c',
     'spell-check.h'