summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-02-18 23:22:04 +0100
committerCarlos Garnacho <carlosg@gnome.org>2019-02-18 23:22:04 +0100
commitd6f408ff608e36d8f7ae5242422f6cd7a3de433f (patch)
treeac9fce38a64d38f91aea1e93d3192ff2c03f399c
parente598a63dd048f43c58a5f62ec888c73c9a77fa45 (diff)
parent016ee4711ecddc4448910d909dbe03619cf9ff74 (diff)
downloadtracker-d6f408ff608e36d8f7ae5242422f6cd7a3de433f.tar.gz
Merge branch 'mraudsepp/tracker-meson-docs-options'
-rw-r--r--docs/meson.build10
-rw-r--r--meson.build6
-rw-r--r--meson_options.txt4
3 files changed, 11 insertions, 9 deletions
diff --git a/docs/meson.build b/docs/meson.build
index 76e59797e..e43b12a8b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,3 +1,7 @@
-subdir('tools')
-subdir('manpages')
-subdir('reference')
+if get_option('man')
+ subdir('manpages')
+endif
+if get_option('docs')
+ subdir('tools')
+ subdir('reference')
+endif
diff --git a/meson.build b/meson.build
index b282d526a..6dc2a1655 100644
--- a/meson.build
+++ b/meson.build
@@ -325,11 +325,7 @@ typelib_dir = gobject_introspection.get_pkgconfig_variable('typelibdir',
subdir('src')
subdir('data')
-
-if get_option('docs')
- subdir('docs')
-endif
-
+subdir('docs')
subdir('examples')
subdir('utils')
diff --git a/meson_options.txt b/meson_options.txt
index 9443b8b1e..5173189d9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,11 +1,13 @@
option('docs', type: 'boolean', value: true,
- description: 'Enable the documentation')
+ description: 'Generate API documentation with gtk-doc')
option('fts', type: 'boolean', value: true,
description: 'Enable the Tracker full-text search feature')
option('functional_tests', type: 'boolean', value: true,
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: 'feature', value: 'auto',
description: 'Connection detection through NetworkManager')