[pango/pango2] more ci build fixes

[Matthias Clasen <matthiasc src gnome org>]

commit 453689850f6a05a7a540dd5ab5ca4973a2dbffd8
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jun 14 00:16:36 2022 -0400

    more ci build fixes

 .gitlab-ci.yml    | 2 +-
 docs/meson.build  | 2 +-
 meson.build       | 6 +++---
 meson_options.txt | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4658bfa25..a55a95f26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dwerror=true"
+  COMMON_MESON_FLAGS: "-Dwerror=true"
   MESON_TEST_TIMEOUT_MULTIPLIER: 2
   FEDORA_IMAGE: registry.gitlab.gnome.org/gnome/pango/fedora:v9
 
diff --git a/docs/meson.build b/docs/meson.build
index 58543b015..e331f67a0 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,4 +1,4 @@
-gidocgen = find_program('gi-docgen', required: get_option('docs'))
+gidocgen = find_program('gi-docgen', required: get_option('documentation'))
 
 pango_content_files = [
   'first_steps.md',
diff --git a/meson.build b/meson.build
index 3a3deab3d..51e40c9a7 100644
--- a/meson.build
+++ b/meson.build
@@ -361,7 +361,7 @@ pango_deps += libsysprof_capture_dep
 
 gidocgen_dep = dependency('gi-docgen', version: '>= 2021.1',
                           fallback: ['gi-docgen', 'dummy_dep'],
-                          required: get_option('docs'))
+                          required: get_option('documentation'))
 
 gnome = import('gnome')
 pkgconfig = import('pkgconfig')
@@ -378,7 +378,7 @@ subdir('examples')
 subdir('tests')
 subdir('tools')
 
-if get_option('docs')
+if get_option('documentation')
   subdir('docs')
 endif
 
@@ -399,7 +399,7 @@ summary('Linker', cc.get_linker_id(), section: 'Toolchain')
 summary('Debugging', get_option('debug'), section: 'Build')
 summary('Optimization', get_option('optimization'), section: 'Build')
 summary('Introspection', get_option('introspection').enabled(), section: 'Build')
-summary('Documentation', get_option('docs'), section: 'Build')
+summary('Documentation', get_option('documentation'), section: 'Build')
 summary('Install tests', get_option('install-tests'), section: 'Build')
 
 summary('prefix', pango_prefix, section: 'Directories')
diff --git a/meson_options.txt b/meson_options.txt
index 733174ed1..d522e4bbf 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('docs',
+option('documentation',
        description: 'Build API reference for Pango',
        type: 'boolean',
        value: false)