pidgin/pidgin

Fix introspection meson option.

2020-12-09, Elliott Sales de Andrade
ce42c0efab90
Parents 732fde496206
Children 172be5d704ed
Fix introspection meson option.

It is no longer a disabler, so passing it to required: does not turn off that
dependency like it should. Also, the options in the projects were renamed.

Testing Done:
`meson configure -Dintrospection=false`, plus a bunch of plugin options off too since that need introspection.

Reviewed at https://reviews.imfreedom.org/r/266/
1 files changed, 7 insertions(+), 4 deletions(-)
  • +7 -4
    meson.build
    • --- a/meson.build Fri Dec 04 02:57:01 2020 -0600
    +++ b/meson.build Wed Dec 09 01:16:47 2020 -0600
    @@ -282,8 +282,11 @@
    # Check for GObject Introspection
    #######################################################################
    -enable_introspection = dependency('gobject-introspection-1.0', version : '>= 1.30.0',
    - required : get_option('introspection')).found()
    +if get_option('introspection')
    + enable_introspection = dependency('gobject-introspection-1.0', version : '>= 1.30.0').found()
    +else
    + enable_introspection = false
    +endif
    conf.set('ENABLE_INTROSPECTION', enable_introspection)
    #######################################################################
    @@ -310,7 +313,7 @@
    talkatu_proj = subproject('talkatu',
    default_options : [
    'doc=' + get_option('doc').to_string(),
    - 'gobject-introspection=' + enable_introspection.to_string(),
    + 'introspection=' + enable_introspection.to_string(),
    'nls=' + get_option('nls').to_string(),
    ]
    )
    @@ -629,7 +632,7 @@
    gplugin_proj = subproject('gplugin',
    default_options : [
    'doc=' + get_option('doc').to_string(),
    - 'gobject-introspection=' + enable_introspection.to_string(),
    + 'introspection=' + enable_introspection.to_string(),
    'nls=' + get_option('nls').to_string(),
    'gtk3=' + get_option('gtkui').to_string(),
    ]