diff options
author | Gary Kramlich <grim@reaperworld.com> | 2019-10-14 02:07:07 -0500 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2019-10-14 02:07:07 -0500 |
commit | e1f5acf0b194b9fd2af2e037036eed54b55354c3 (patch) | |
tree | 17b640056def31a9bf83a0845698127db58f85b7 | |
parent | e7abf9ed600ea43bd4e3b8130da2c80f19be1120 (diff) | |
download | pidgin-e1f5acf0b194b9fd2af2e037036eed54b55354c3.tar.gz |
Fix up the introspection feature so it can be disabled correctly
-rw-r--r-- | finch/meson.build | 9 | ||||
-rw-r--r-- | meson.build | 16 |
2 files changed, 17 insertions, 8 deletions
diff --git a/finch/meson.build b/finch/meson.build index 89147387d8..9be24039b2 100644 --- a/finch/meson.build +++ b/finch/meson.build @@ -2,7 +2,9 @@ enable_consoleui = false 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 @@ if get_option('consoleui') ] ) 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 ####################################################################### diff --git a/meson.build b/meson.build index 72aff721cf..52ac76da70 100644 --- a/meson.build +++ b/meson.build @@ -307,8 +307,8 @@ if get_option('gtkui') 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 @@ if get_option('gtkui') ] ) 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 @@ endif ####################################################################### 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 @@ else ] ) 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 |