[gedit] build: always require GObject Introspection and vapigen

[Sébastien Wilmet <swilmet src gnome org>]

commit 9994fae8a2b9fceff5f318ac4dc098b9080a28ea
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Mar 14 13:38:19 2020 +0100

    build: always require GObject Introspection and vapigen
    
    The gedit repo contains Python plugins. And the gedit-plugins repo
    contains one Vala plugin.
    
    It simplifies the build instructions.

 gedit/meson.build | 94 +++++++++++++++++++++++++++----------------------------
 meson.build       | 17 ++--------
 meson_options.txt |  8 -----
 3 files changed, 48 insertions(+), 71 deletions(-)
---
diff --git a/gedit/meson.build b/gedit/meson.build
index 075c001b2..ff77676b5 100644
--- a/gedit/meson.build
+++ b/gedit/meson.build
@@ -189,61 +189,59 @@ libgedit_sha = shared_library(
   install_dir: pkglibdir,
 )
 
-if generate_gir == true
-  libgedit_public_h += [
-    libgedit_enums.get(1),
-  ]
+# GObject Introspection
+libgedit_public_h += [
+  libgedit_enums.get(1),
+]
 
-  libgedit_gir_includes = [
-    'Gtk-3.0',
-    'GtkSource-4',
-  ]
+libgedit_gir_includes = [
+  'Gtk-3.0',
+  'GtkSource-4',
+]
 
-  libgedit_gir = gnome.generate_gir(
-    libgedit_sha,
-    sources: libgedit_sources + libgedit_public_h,
-    nsversion: '3.0',
-    namespace: 'Gedit',
-    symbol_prefix: 'gedit',
-    identifier_prefix: 'Gedit',
-    export_packages: [package_string],
-    includes: libgedit_gir_includes,
-    link_with: libgedit_sha,
-    install: true,
-    install_dir_gir: join_paths(pkgdatadir, 'gir-1.0'),
-    install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
-  )
+libgedit_gir = gnome.generate_gir(
+  libgedit_sha,
+  sources: libgedit_sources + libgedit_public_h,
+  nsversion: '3.0',
+  namespace: 'Gedit',
+  symbol_prefix: 'gedit',
+  identifier_prefix: 'Gedit',
+  export_packages: [package_string],
+  includes: libgedit_gir_includes,
+  link_with: libgedit_sha,
+  install: true,
+  install_dir_gir: join_paths(pkgdatadir, 'gir-1.0'),
+  install_dir_typelib: join_paths(pkglibdir, 'girepository-1.0'),
+)
 
-  python3.install_sources(
-    'Gedit.py',
-    subdir: join_paths(
-      'gi',
-      'overrides',
-    )
+python3.install_sources(
+  'Gedit.py',
+  subdir: join_paths(
+    'gi',
+    'overrides',
   )
+)
 
-  libgedit_dep_sources += [
-    libgedit_gir,
-  ]
+libgedit_dep_sources += [
+  libgedit_gir,
+]
 
-  if generate_vapi == true
-    libgedit_vapi_packages = [
-      'gio-2.0',
-      'atk',
-      'gdk-3.0',
-      'gtk+-3.0',
-      'gtksourceview-4',
-    ]
+# Vala API
+libgedit_vapi_packages = [
+  'gio-2.0',
+  'atk',
+  'gdk-3.0',
+  'gtk+-3.0',
+  'gtksourceview-4',
+]
 
-    libgedit_vapi = gnome.generate_vapi(
-      meson.project_name(),
-      sources: libgedit_gir.get(0),
-      packages: libgedit_vapi_packages,
-      install: true,
-      install_dir: vapidir,
-    )
-  endif
-endif
+libgedit_vapi = gnome.generate_vapi(
+  meson.project_name(),
+  sources: libgedit_gir.get(0),
+  packages: libgedit_vapi_packages,
+  install: true,
+  install_dir: vapidir,
+)
 
 libgedit_dep = declare_dependency(
   link_with: libgedit_sha,
diff --git a/meson.build b/meson.build
index 4d3b57e4a..7df0700ee 100644
--- a/meson.build
+++ b/meson.build
@@ -66,8 +66,8 @@ libgd_dep = libgd_subproject.get_variable('libgd_dep')
 gspell_dep = dependency('gspell-1', version: '>= 1.0', required: true)
 x11_dep = dependency('x11', required: false)
 
-introspection_dep = dependency('gobject-introspection-1.0', required: false)
-vapigen_dep = dependency('vapigen', version: '>= 0.25.1', required: false)
+introspection_dep = dependency('gobject-introspection-1.0')
+vapigen_dep = dependency('vapigen', version: '>= 0.25.1')
 
 python3 = python.find_installation('python3')
 
@@ -100,17 +100,6 @@ configure_file(
   configuration: config_h
 )
 
-# Options
-generate_gir = get_option('introspection')
-if generate_gir and not introspection_dep.found()
-  generate_gir = false
-endif
-
-generate_vapi = generate_gir and get_option('vapi')
-if generate_vapi and not vapigen_dep.found()
-  generate_vapi = false
-endif
-
 active_plugins = [
   'docinfo',
   'modelines',
@@ -152,8 +141,6 @@ summary = [
   '        Prefix:                @0@'.format(get_option('prefix')),
   '        API documentation:     @0@'.format(get_option('gtk_doc')),
   '        User documentation:    @0@'.format(get_option('user_documentation')),
-  '        GObject Introspection: @0@'.format(generate_gir),
-  '        Vala API:              @0@'.format(generate_vapi),
   '',
 ]
 message('\n'.join(summary))
diff --git a/meson_options.txt b/meson_options.txt
index d0cbf0720..78f261b6d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,11 +1,3 @@
-option('introspection',
-       type: 'boolean', value: true,
-       description: 'Generate GObject Introspection data (requires gobject-introspection)')
-
-option('vapi',
-       type: 'boolean', value: true,
-       description: 'Generate vapi data for Vala (requires vapigen)')
-
 option('gtk_doc',
        type: 'boolean', value: false,
        description: 'Build API reference for plugins (requires gtk-doc)')