changeset
libpurple: Move libidn meson dependency to Jabber prpl
Tue, 06 Nov 2018 01:12:48 -0600
- author
- Mike Ruprecht <cmaiku@gmail.com>
- date
- Tue, 06 Nov 2018 01:12:48 -0600
- changeset 39292
- c286932bbbd8
- parent 39291
- 9d253537d927
- child 39293
- c6121a164a6d
libpurple: Move libidn meson dependency to Jabber prpl
Now that libidn is no longer used directly in libpurple, the meson
dependency can be moved to the Jabber prpl as it's the only place
that still uses it. This patch does so.
--- a/libpurple/meson.build Mon Nov 05 18:57:24 2018 -0600 +++ b/libpurple/meson.build Tue Nov 06 01:12:48 2018 -0600 @@ -399,7 +399,7 @@ dependencies : # static_link_libs [dbus, dbus_glib, dnsapi, ws2_32, glib, gio, gplugin, libxml, farstream, gstreamer, gstreamer_video, - gstreamer_app, idn, json, math]) + gstreamer_app, json, math]) libpurple_dep = declare_dependency( # Ensure purple/dbus headers built before any dependencies:
--- a/libpurple/protocols/jabber/meson.build Mon Nov 05 18:57:24 2018 -0600 +++ b/libpurple/protocols/jabber/meson.build Tue Nov 06 01:12:48 2018 -0600 @@ -1,3 +1,15 @@ +####################################################################### +# Check for Internationalized Domain Name support +####################################################################### + +if get_option('idn') + idn = dependency('libidn', version : '>= 0.0.0', required : force_deps) + use_idn = [ '-DUSE_IDN' ] +else + idn = [] + use_idn = [] +endif + JABBERSOURCES = [ 'adhoccommands.c', 'adhoccommands.h', @@ -104,11 +116,12 @@ if STATIC_JABBER jabber_prpl = static_library('jabber', JABBERSOURCES, - c_args : '-DPURPLE_STATIC_PRPL', + c_args : ['-DPURPLE_STATIC_PRPL', use_idn], link_args : jabber_link_args, dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math, ws2_32]) elif DYNAMIC_JABBER jabber_prpl = shared_library('jabber', JABBERSOURCES, + c_args : use_idn, link_args : jabber_link_args, dependencies : [gstreamer, idn, libxml, sasl, libpurple_dep, glib, gio, math, ws2_32], install : true, install_dir : PURPLE_PLUGINDIR)
--- a/meson.build Mon Nov 05 18:57:24 2018 -0600 +++ b/meson.build Tue Nov 06 01:12:48 2018 -0600 @@ -465,17 +465,6 @@ endif ####################################################################### -# Check for Internationalized Domain Name support -####################################################################### - -if get_option('idn') - idn = dependency('libidn', version : '>= 0.0.0', required : force_deps) - conf.set('USE_IDN', idn.found()) -else - idn = [] -endif - -####################################################################### # Check for Meanwhile headers (for Sametime) ####################################################################### if get_option('meanwhile')
