summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2018-10-27 06:30:47 -0400
committerXavier Claessens <xavier.claessens@collabora.com>2019-01-07 10:42:23 -0500
commit461edcc8cd6dc1c4efeb09aaaba02459293546f2 (patch)
treeed558ec6e7e80c839d4b1d34934792166cc9a0c9
parent9d7a3bf039f063d78dc8db84e0de7b6310206b2c (diff)
downloadjson-glib-461edcc8cd6dc1c4efeb09aaaba02459293546f2.tar.gz
Change introspection option to feature type
-rw-r--r--json-glib/meson.build4
-rw-r--r--meson_options.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/json-glib/meson.build b/json-glib/meson.build
index bc8469a..035e954 100644
--- a/json-glib/meson.build
+++ b/json-glib/meson.build
@@ -93,8 +93,8 @@ pkgg.generate(
requires: 'gio-2.0',
)
-build_gir = get_option('introspection')
-if build_gir
+gir = find_program('g-ir-scanner', required : get_option('introspection'))
+if gir.found()
gir_args = [
'--quiet',
'--c-include=json-glib/json-glib.h',
diff --git a/meson_options.txt b/meson_options.txt
index 75152aa..aba8129 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,5 +1,5 @@
option('introspection',
- type: 'boolean', value: true,
+ type: 'feature', value: 'auto', yield: true,
description: 'Build the introspection data (requires gobject-introspection)')
option('docs',
type: 'boolean', value: false,