[pango] Revert "meson: Change introspection option to yielding feature"

[Matthias Clasen <matthiasc src gnome org>]

commit bbdb6890f2c45a7f5353402fb723073d15227612
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 30 08:54:07 2020 -0400

    Revert "meson: Change introspection option to yielding feature"
    
    This reverts commit 82cfabbabaade239beb26136cb28c98156552ea5.
    
    This change broke GTK ci, and it takes more work to fix it than
    I can invest atm. We can try again when GTK is ready for it.

 .gitlab-ci.yml    | 2 +-
 meson_options.txt | 5 ++---
 pango/meson.build | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c287010c..dffa8056 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=disabled _build
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false 
_build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build
   allow_failure: true
diff --git a/meson_options.txt b/meson_options.txt
index 235b8a48..5aa7c795 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,9 +4,8 @@ option('gtk_doc',
        value: false)
 option('introspection',
        description: 'Build the GObject introspection data for Pango',
-       type: 'feature',
-       value: 'auto',
-       yield: true)
+       type: 'boolean',
+       value: true)
 option('install-tests',
        description : 'Install tests',
        type: 'boolean',
diff --git a/pango/meson.build b/pango/meson.build
index 0b87b644..4c055f52 100644
--- a/pango/meson.build
+++ b/pango/meson.build
@@ -121,8 +121,7 @@ libpango = library(
 
 pango_dep_sources = [pango_enum_h]
 
-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())
+build_gir = get_option('introspection')
 
 if build_gir
   gir_args = [