changeset
Fix libpidgin not building on Windows.
Wed, 30 Oct 2019 21:20:33 -0400
- author
- Elliott Sales de Andrade <qulogic@pidgin.im>
- date
- Wed, 30 Oct 2019 21:20:33 -0400
- changeset 40090
- 5bd53ccdca70
- parent 40089
- 3cd0ba8ff140
- child 40091
- ff90f032afe4
Fix libpidgin not building on Windows.
Having `x11` be a disabler on Windows disables the libpidgin library,
but there are a lot of benefits to it being a disabler in other places.
Instead, just drop the dependency from libpidgin when unavailable.
| pidgin/meson.build | file | annotate | diff | comparison | revisions |
--- a/pidgin/meson.build Mon Oct 28 22:41:37 2019 -0400 +++ b/pidgin/meson.build Wed Oct 30 21:20:33 2019 -0400 @@ -156,13 +156,7 @@ install_headers(libpidgin_headers, subdir : 'pidgin-3') - libpidgin_inc = include_directories('.') - libpidgin = shared_library('pidgin3', - libpidgin_SOURCES, - package_revision, - include_directories : [toplevel_inc], - version : PURPLE_LIB_VERSION, - dependencies : [ + _libpidgin_dependencies = [ glib, gstreamer_video, gtk, @@ -171,9 +165,18 @@ math, libsoup, talkatu_dep, - x11, libpurple_dep, - ], + ] + if x11.found() + _libpidgin_dependencies += x11 + endif + libpidgin_inc = include_directories('.') + libpidgin = shared_library('pidgin3', + libpidgin_SOURCES, + package_revision, + include_directories : [toplevel_inc], + version : PURPLE_LIB_VERSION, + dependencies : _libpidgin_dependencies, install : true) libpidgin_dep = declare_dependency( include_directories : [toplevel_inc, libpidgin_inc],
