changeset
Merged in CMaiku/pidgin (pull request #343)
Mon, 14 May 2018 06:42:27 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Mon, 14 May 2018 06:42:27 +0000
- changeset 39033
- 680c52289da2
- parent 39031
- 01818291b450 (current diff)
- parent 39032
- 068fd7f93fda (diff)
- child 39049
- 65706fd79d19
Merged in CMaiku/pidgin (pull request #343)
meson: Add introspection option for disabling GObject Introspection
Approved-by: Gary Kramlich <grim@reaperworld.com>
--- a/meson.build Sat May 12 18:42:52 2018 +0000 +++ b/meson.build Mon May 14 06:42:27 2018 +0000 @@ -905,16 +905,23 @@ gplugin = dependency('gplugin', version : '>= 0.0.17') # GPLUGIN_REQ sets pkg-config requirements in the .pc file GPLUGIN_REQ = ['gplugin'] - enable_introspection = dependency('gobject-introspection-1.0', - version : '>= 1.30.0', required : false).found() else gplugin = [] GPLUGIN_REQ = [] - enable_introspection = false endif +####################################################################### +# Check for GObject Introspection +####################################################################### + +enable_introspection = get_option('introspection') if enable_introspection - conf.set('ENABLE_INTROSPECTION', true) + if dependency('gobject-introspection-1.0', version : '>= 1.30.0', + required : force_deps).found() + conf.set('ENABLE_INTROSPECTION', true) + else + enable_introspection = false + endif endif #######################################################################
--- a/meson_options.txt Sat May 12 18:42:52 2018 +0000 +++ b/meson_options.txt Mon May 14 06:42:27 2018 +0000 @@ -71,6 +71,9 @@ option('plugins', type : 'boolean', value : true, description : 'compile with plugin support') +option('introspection', type : 'boolean', value : true, + description : 'build introspection data') + option('krb4', type : 'boolean', value : false, description : 'compile Zephyr plugin with Kerberos 4 support')
