[tracker: 2/3] Merge branch 'mraudsepp/tracker-meson-docs-options'

[Carlos Garnacho <carlosg src gnome org>]

commit d6f408ff608e36d8f7ae5242422f6cd7a3de433f
Merge: e598a63dd 016ee4711
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Feb 18 23:22:04 2019 +0100

    Merge branch 'mraudsepp/tracker-meson-docs-options'

 docs/meson.build  | 10 +++++++---
 meson.build       |  6 +-----
 meson_options.txt |  4 +++-
 3 files changed, 11 insertions(+), 9 deletions(-)
---
diff --cc meson_options.txt
index 9443b8b1e,030940dd4..5173189d9
--- a/meson_options.txt
+++ b/meson_options.txt
@@@ -6,11 -6,13 +6,13 @@@ option('functional_tests', type: 'boole
         description: 'Enable the Tracker functional test suite')
  option('journal', type: 'boolean', value: true,
         description: 'Enable database journal backup mechanism')
+ option('man', type: 'boolean', value: true,
+        description: 'Install man pages')
  
 -option('network_manager', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto',
 -       description: 'Enable connection detection through NetworkManager')
 -option('stemmer', type: 'combo', choices: ['auto', 'no', 'yes'], value: 'auto',
 -       description: 'Enable stemming words while indexing')
 +option('network_manager', type: 'feature', value: 'auto',
 +       description: 'Connection detection through NetworkManager')
 +option('stemmer', type: 'feature', value: 'auto',
 +       description: 'Stemming words while indexing')
  option('unicode_support', type: 'combo', choices: ['icu', 'unistring', 'auto'], value: 'auto',
         description: 'Unicode support library to use')