diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2022-09-12 13:38:01 -0400 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2022-09-27 20:23:43 -0500 |
| commit | 1aa774034a5190062734ceaeb09138f922430fd3 (patch) | |
| tree | 30fc228af49c6fec173d43688f1087e80b3d6751 /meson.build | |
| parent | f659aab5b5db859d389f82b3d4a1a4a7b13ed849 (diff) | |
| download | at-spi2-core-1aa774034a5190062734ceaeb09138f922430fd3.tar.gz | |
meson: Change introspection option to feature
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/meson.build b/meson.build index 3131538c..44f109f6 100644 --- a/meson.build +++ b/meson.build @@ -123,7 +123,6 @@ glib_req_version = '>= 2.67.4' gobject_req_version = '>= 2.0.0' gmodule_req_version = '>= 2.0.0' gio_req_version = '>= 2.28.0' -gir_req_version = '>= 0.6.7' libxml_req_version = '>= 2.9.1' libdbus_dep = dependency('dbus-1', version: libdbus_req_version) @@ -174,16 +173,8 @@ at_spi_conf.set('ALIGNOF_DBIND_POINTER', cc.alignment('dbind_pointer', prefix: ' at_spi_conf.set('ALIGNOF_DBIND_STRUCT', cc.alignment('dbind_struct', prefix: 'typedef struct { char s1; } dbind_struct;')) # introspection support -have_gir = false - -introspection_option = get_option('introspection') -if introspection_option != 'no' - gir_dep = dependency('gobject-introspection-1.0', version: gir_req_version, required: false) - - if gir_dep.found() - have_gir = true - endif -endif +gir = find_program('g-ir-scanner', required : get_option('introspection')) +have_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled()) xgettext = find_program('xgettext', required : false) |