[librest/gwagner/oauth2] meson: removed feature for options as its not necessary

[Günther Wagner <gwagner src gnome org>]

commit 840ec31a0849250c24bff83b754975deb98da02e
Author: Günther Wagner <info gunibert de>
Date:   Wed Jan 12 18:37:01 2022 +0100

    meson: removed feature for options as its not necessary

 .gitlab-ci.yml          |  6 +++---
 docs/meson.build        |  2 +-
 meson.build             |  6 +++---
 meson_options.txt       | 10 ++++------
 rest-extras/meson.build |  2 +-
 rest/meson.build        |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d87248b..658de34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ build-librest:
     - dnf update -y --nogpgcheck
     - dnf -y install --nogpgcheck redhat-rpm-config
       glib2-devel gobject-introspection-devel libxml2-devel meson ninja-build
-      libsoup-devel vala json-glib-devel
+      libsoup-devel vala json-glib-devel git
   script:
     - meson _build
     - ninja -C _build
@@ -66,8 +66,8 @@ reference:
       gtk-doc
       json-glib-devel
     MESON_VERSION: "0.55.3"
-    MESON_EXTRA_FLAGS: "-Dintrospection=enabled"
-    DOCS_FLAGS: -Dgtk_doc=enabled
+    MESON_EXTRA_FLAGS: "-Dintrospection=true"
+    DOCS_FLAGS: -Dgtk_doc=true
     DOCS_PATH: docs/librest-1.0
 
 pages:
diff --git a/docs/meson.build b/docs/meson.build
index f201d28..f2aeb76 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,4 +1,4 @@
-if get_option('gtk_doc').enabled() and get_option('introspection').enabled()
+if get_option('gtk_doc') and get_option('introspection')
   dependency('gi-docgen', version: '>= 2021.6',
     fallback: ['gi-docgen', 'dummy_dep'],
   )
diff --git a/meson.build b/meson.build
index b318f47..4fd3195 100644
--- a/meson.build
+++ b/meson.build
@@ -80,7 +80,7 @@ endif
 if get_option('examples')
   subdir('examples')
 endif
-if get_option('gtk_doc').enabled()
+if get_option('gtk_doc')
   subdir('docs')
 endif
 
@@ -115,8 +115,8 @@ summary({
 )
 
 summary({
-    'Introspection': get_option('introspection').enabled() or get_option('introspection').auto(),
-    'Documentation': get_option('gtk_doc').enabled() or get_option('gtk_doc').auto(),
+    'Introspection': get_option('introspection'),
+    'Documentation': get_option('gtk_doc'),
     'Tests': get_option('tests'),
     'Soup 2': get_option('soup2'),
   },
diff --git a/meson_options.txt b/meson_options.txt
index da253e8..83e5d2f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,9 +9,8 @@ option('ca_certificates_path',
   description: 'List of paths to the system Certificate Authority list. If empty, a default set of paths 
will be tried.',
 )
 option('introspection',
-  type: 'feature',
-  value: 'enabled',
-  yield: true,
+  type: 'boolean',
+  value: true,
   description: 'Generate GObject Introspection (.gir) files',
 )
 option('examples',
@@ -20,9 +19,8 @@ option('examples',
   description: 'Build the examples',
 )
 option('gtk_doc',
-  type: 'feature',
-  value: 'auto',
-  yield: true,
+  type: 'boolean',
+  value: true,
   description: 'Build the gtk-doc reference docs',
 )
 option('soup2',
diff --git a/rest-extras/meson.build b/rest-extras/meson.build
index a94f0aa..1ad9ee1 100644
--- a/rest-extras/meson.build
+++ b/rest-extras/meson.build
@@ -45,7 +45,7 @@ librest_extras_dep = declare_dependency(
   link_with: librest_extras_lib,
 )
 
-if get_option('introspection').enabled()
+if get_option('introspection')
   librest_extras_gir = gnome.generate_gir(librest_extras_lib,
     sources: librest_extras_sources + librest_extras_headers,
     namespace: 'RestExtras',
diff --git a/rest/meson.build b/rest/meson.build
index 6d25545..a22742e 100644
--- a/rest/meson.build
+++ b/rest/meson.build
@@ -76,7 +76,7 @@ install_headers(librest_headers,
 rest_dep_sources = []
 
 # GObject Introspection
-if get_option('introspection').enabled()
+if get_option('introspection')
   librest_gir_extra_args = [
     '--accept-unprefixed',
     '--c-include=rest/rest-enum-types.h',