[gtk/matthiasc/for-master] build: Change introspection option to type 'feature'

[Matthias Clasen <matthiasc src gnome org>]

commit d07d3a0db67d082e52f1dbf2611678c2b1e4e7a3
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 30 08:43:10 2020 -0400

    build: Change introspection option to type 'feature'
    
    This is following a similar change in pango, and is
    necessary to fix building with pango as a subproject.

 .gitlab-ci.yml    | 2 +-
 meson_options.txt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 832880d617..2f425ca327 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,7 +223,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 wayland
   artifacts:
diff --git a/meson_options.txt b/meson_options.txt
index f4dc3b43d7..6ed843fe5a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -84,8 +84,8 @@ option('man-pages',
        description : 'Build man pages for installed tools')
 
 option('introspection',
-       type: 'boolean',
-       value: 'true',
+       type: 'feature',
+       value: 'enabled',
        description : 'Build introspection data (requires gobject-introspection)')
 
 # Demos, examples and tests