meson: build gir even when cross-compiling if introspection was enabled explicitly

This can be made to work in certain circumstances when
cross-compiling, so default to not building g-i stuff
when cross-compiling, but allow it if introspection was
enabled explicitly via -Dintrospection=enabled.

See gstreamer/gstreamer#454 and gstreamer/gstreamer#381.

diff --git a/meson.build b/meson.build
index e7a2857ab530f94d7d61e46f99364970b27cd7a7..7832b0414124cffc6ac6f2ba742a4ae1e4df3353 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -94,7 +94,7 @@ gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' +
     'g_setenv("GST_PLUGIN_SYSTEM_PATH_1_0", "", TRUE);' + \
     'gst_init(NULL,NULL);', '--quiet']
 gir = find_program('g-ir-scanner', required : get_option('introspection'))
-build_gir = gir.found() and not meson.is_cross_build()
+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
 gnome = import('gnome')
 
 if gst_dep.type_name() == 'internal'