pidgin/pidgin

Fix up the introspection feature so it can be disabled correctly

2019-10-14, Gary Kramlich
3f81150e326b
Parents dac8511b1992
Children da9efbd154f3
Fix up the introspection feature so it can be disabled correctly
2 files changed, 17 insertions(+), 8 deletions(-)
  • +7 -2
    finch/meson.build
  • +10 -6
    meson.build
    • --- a/finch/meson.build Sun Oct 13 05:58:32 2019 -0500
    +++ b/finch/meson.build Mon Oct 14 02:07:07 2019 -0500
    @@ -2,7 +2,9 @@
    if get_option('consoleui')
    libgnt_dep = dependency('gnt3', version : '>= 3.0.0', required : false)
    if libgnt_dep.found()
    - libgnt_gir = ['Gnt-3.0']
    + if enable_introspection
    + libgnt_gir = ['Gnt-3.0']
    + endif
    else
    libgnt_proj = subproject('libgnt',
    default_options : [
    @@ -10,7 +12,10 @@
    ]
    )
    libgnt_dep = libgnt_proj.get_variable('libgnt_dep')
    - libgnt_gir = libgnt_proj.get_variable('libgnt_gir')
    +
    + if enable_introspection
    + libgnt_gir = libgnt_proj.get_variable('libgnt_gir')
    + endif
    endif
    #######################################################################
    --- a/meson.build Sun Oct 13 05:58:32 2019 -0500
    +++ b/meson.build Mon Oct 14 02:07:07 2019 -0500
    @@ -307,8 +307,8 @@
    talkatu_dep = dependency('talkatu', version: '>=0.1.0', required : false)
    if talkatu_dep.found()
    - talkatu_gir = 'Talkatu-0.0'
    - if get_option('introspection')
    + if enable_introspection
    + talkatu_gir = 'Talkatu-0.0'
    talkatu_include_directories = include_directories(
    join_paths(talkatu_dep.get_pkgconfig_variable('prefix'),
    'share/gir-1.0'))
    @@ -324,7 +324,9 @@
    ]
    )
    talkatu_dep = talkatu_proj.get_variable('talkatu_dep')
    - talkatu_gir = talkatu_proj.get_variable('talkatu_gir')[0]
    + if enable_introspection
    + talkatu_gir = talkatu_proj.get_variable('talkatu_gir')[0]
    + endif
    talkatu_include_directories = []
    endif
    endif # GTK
    @@ -629,8 +631,8 @@
    #######################################################################
    gplugin_dep = dependency('gplugin', version : '>= 0.28.0', required : false)
    if gplugin_dep.found()
    - gplugin_gir = 'GPlugin-0.0'
    - if get_option('introspection')
    + if enable_introspection
    + gplugin_gir = 'GPlugin-0.0'
    gplugin_include_directories = include_directories(
    join_paths(gplugin_dep.get_pkgconfig_variable('prefix'),
    'share/gir-1.0'))
    @@ -646,7 +648,9 @@
    ]
    )
    gplugin_dep = gplugin_proj.get_variable('gplugin_dep')
    - gplugin_gir = gplugin_proj.get_variable('gplugin_gir')[0]
    + if enable_introspection
    + gplugin_gir = gplugin_proj.get_variable('gplugin_gir')[0]
    + endif
    gplugin_include_directories = []
    endif