Make doc/introspection options yield to parent.
This allows `meson -Ddoc=false` to automatically propagate from Pidgin to the gplugin subproject, without having to specify `-Dgplugin:doc=false`.
Reviewed at https://reviews.imfreedom.org/r/87/
--- a/gplugin-gtk/meson.build Thu Jul 23 20:16:27 2020 -0500
+++ b/gplugin-gtk/meson.build Sat Aug 22 19:29:50 2020 -0500
@@ -111,7 +111,7 @@
###############################################################################
###############################################################################
-if get_option('gobject-introspection')
+if get_option('introspection') gplugin_gtk_gir = gnome.generate_gir(
sources : GPLUGIN_GTK_SOURCES + GPLUGIN_GTK_HEADERS +
--- a/gplugin/meson.build Thu Jul 23 20:16:27 2020 -0500
+++ b/gplugin/meson.build Sat Aug 22 19:29:50 2020 -0500
@@ -199,7 +199,7 @@
###############################################################################
###############################################################################
-if get_option('gobject-introspection')
+if get_option('introspection') gplugin_gir = gnome.generate_gir(gplugin,
sources : GPLUGIN_SOURCES + GPLUGIN_HEADERS +
GPLUGIN_PUBLIC_BUILT_SOURCES +
--- a/lua/meson.build Thu Jul 23 20:16:27 2020 -0500
+++ b/lua/meson.build Sat Aug 22 19:29:50 2020 -0500
@@ -1,5 +1,5 @@
- if not get_option('gobject-introspection')
+ if not get_option('introspection') error('Lua plugin requires GObject Introspection.')
--- a/meson_options.txt Thu Jul 23 20:16:27 2020 -0500
+++ b/meson_options.txt Sat Aug 22 19:29:50 2020 -0500
@@ -1,12 +1,12 @@
- type : 'boolean', value : true,
+ type : 'boolean', value : true, yield : true, description : 'build documentation with gtk-doc'
- 'gobject-introspection',
- type : 'boolean', value : true,
+ type : 'boolean', value : true, yield : true, description : 'Whether or not to build a GObject Introspection type library'
--- a/packaging/mingw-cross/PKGBUILD Thu Jul 23 20:16:27 2020 -0500
+++ b/packaging/mingw-cross/PKGBUILD Sat Aug 22 19:29:50 2020 -0500
@@ -28,7 +28,7 @@
- -Dgobject-introspection=false \
+ -Dintrospection=false \ --- a/perl/meson.build Thu Jul 23 20:16:27 2020 -0500
+++ b/perl/meson.build Sat Aug 22 19:29:50 2020 -0500
@@ -1,5 +1,5 @@
- if not get_option('gobject-introspection')
+ if not get_option('introspection') error('Perl plugin requires GObject Introspection.')
--- a/python/meson.build Thu Jul 23 20:16:27 2020 -0500
+++ b/python/meson.build Sat Aug 22 19:29:50 2020 -0500
@@ -1,5 +1,5 @@
- if not get_option('gobject-introspection')
+ if not get_option('introspection') error('Python plugin requires GObject Introspection.')
--- a/vala/meson.build Thu Jul 23 20:16:27 2020 -0500
+++ b/vala/meson.build Sat Aug 22 19:29:50 2020 -0500
@@ -1,5 +1,5 @@
- if not get_option('gobject-introspection')
+ if not get_option('introspection') error('Vala generation requires GObject Introspection.')