diff options
| -rw-r--r-- | doc/reference/pidgin/meson.build | 1 | ||||
| -rw-r--r-- | meson.build | 30 | ||||
| -rw-r--r-- | pidgin/meson.build | 2 |
3 files changed, 4 insertions, 29 deletions
diff --git a/doc/reference/pidgin/meson.build b/doc/reference/pidgin/meson.build index fb8aad32bd..55229bf651 100644 --- a/doc/reference/pidgin/meson.build +++ b/doc/reference/pidgin/meson.build @@ -26,7 +26,6 @@ mkdb_args = [ # Extra options to supply to fixxref fixxref_args = [ - '--extra-dir=@0@'.format(talkatu_docpath), '--extra-dir=../libpurple', ] diff --git a/meson.build b/meson.build index cfaa3b0ca7..892384498f 100644 --- a/meson.build +++ b/meson.build @@ -259,33 +259,9 @@ if get_option('gtkui') gtk = dependency('gtk+-3.0', version : '>= 3.24.0') libhandy = dependency('libhandy-1', version : '>= 1') - talkatu_dep = dependency('talkatu', version: '>=0.1.0', required : false) - if talkatu_dep.found() - talkatu_docpath = talkatu_dep.get_pkgconfig_variable('prefix') / 'share/gtk-doc/html' - - if enable_introspection - talkatu_gir = 'Talkatu-0.0' - talkatu_include_directories = include_directories( - talkatu_dep.get_pkgconfig_variable('prefix') / 'share/gir-1.0') - else - talkatu_include_directories = [] - endif - else - talkatu_proj = subproject('talkatu', - default_options : [ - 'doc=' + get_option('doc').to_string(), - 'introspection=' + enable_introspection.to_string(), - 'nls=' + get_option('nls').to_string(), - ] - ) - talkatu_dep = talkatu_proj.get_variable('talkatu_dep') - - talkatu_docpath = meson.project_build_root() / 'subprojects/talkatu/talkatu/reference/' - if enable_introspection - talkatu_gir = talkatu_proj.get_variable('talkatu_gir')[0] - endif - talkatu_include_directories = [] - endif + talkatu_dep = dependency('talkatu', + version: '>=0.1.0', + fallback: ['talkatu', 'talkatu_dep']) endif # GTK ENABLE_GTK = get_option('gtkui') diff --git a/pidgin/meson.build b/pidgin/meson.build index edc087adac..ff23e08cd3 100644 --- a/pidgin/meson.build +++ b/pidgin/meson.build @@ -316,7 +316,7 @@ if ENABLE_GTK Pidgin_gir_includes = [ 'GObject-2.0', 'Gtk-3.0', 'GPlugin-1.0', 'GPluginGtk-1.0', - talkatu_gir, + 'Talkatu-0.0', # subproject needs to be before libpurple in the repo so that # meson will use our variables and not try to discover them from # libpurple. |