From 2bea8f78c8b1ac4fb320817c23c03f59230ef9f3 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 30 Sep 2020 00:02:27 +0000
Subject: Merge branch 'introspection' into 'master'

meson: Change introspection option to yielding feature

See merge request GNOME/pango!247

(cherry picked from commit c64f48351e57a58f4f355116efd2230d83c458c0)

82cfabba meson: Change introspection option to yielding feature
---
 .gitlab-ci.yml    | 2 +-
 meson_options.txt | 5 +++--
 pango/meson.build | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dffa8056..c287010c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,7 @@ asan-build:
   needs: []
   variables:
   script:
-    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build
   allow_failure: true
diff --git a/meson_options.txt b/meson_options.txt
index 5aa7c795..235b8a48 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,8 +4,9 @@ option('gtk_doc',
        value: false)
 option('introspection',
        description: 'Build the GObject introspection data for Pango',
-       type: 'boolean',
-       value: true)
+       type: 'feature',
+       value: 'auto',
+       yield: true)
 option('install-tests',
        description : 'Install tests',
        type: 'boolean',
diff --git a/pango/meson.build b/pango/meson.build
index 4c055f52..0b87b644 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -121,7 +121,8 @@ libpango = library(
 
 pango_dep_sources = [pango_enum_h]
 
-build_gir = get_option('introspection')
+gir = find_program('g-ir-scanner', required : get_option('introspection'))
+build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
 
 if build_gir
   gir_args = [
-- 
cgit v1.2.1