Mon, 22 Aug 2016 04:24:11 -0400
Add jabber to meson build.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/jabber/meson.build Mon Aug 22 04:24:11 2016 -0400 @@ -0,0 +1,116 @@ +JABBERSOURCES = [ + 'adhoccommands.c', + 'adhoccommands.h', + 'auth.c', + 'auth.h', + 'auth_digest_md5.c', + 'auth_digest_md5.h', + 'auth_plain.c', + 'auth_scram.c', + 'auth_scram.h', + 'buddy.c', + 'buddy.h', + 'bosh.c', + 'bosh.h', + 'caps.c', + 'caps.h', + 'chat.c', + 'chat.h', + 'data.c', + 'data.h', + 'disco.c', + 'disco.h', + 'google/gmail.c', + 'google/gmail.h', + 'google/google.c', + 'google/google.h', + 'google/google_p2p.c', + 'google/google_p2p.h', + 'google/google_presence.c', + 'google/google_presence.h', + 'google/google_roster.c', + 'google/google_roster.h', + 'google/google_session.c', + 'google/google_session.h', + 'google/jingleinfo.c', + 'google/jingleinfo.h', + 'google/relay.c', + 'google/relay.h', + 'gtalk.c', + 'gtalk.h', + 'ibb.c', + 'ibb.h', + 'iq.c', + 'iq.h', + 'jabber.c', + 'jabber.h', + 'jingle/jingle.c', + 'jingle/jingle.h', + 'jingle/content.c', + 'jingle/content.h', + 'jingle/iceudp.c', + 'jingle/iceudp.h', + 'jingle/rawudp.c', + 'jingle/rawudp.h', + 'jingle/rtp.c', + 'jingle/rtp.h', + 'jingle/session.c', + 'jingle/session.h', + 'jingle/transport.c', + 'jingle/transport.h', + 'jutil.c', + 'jutil.h', + 'message.c', + 'message.h', + 'namespaces.h', + 'oob.c', + 'oob.h', + 'parser.c', + 'parser.h', + 'pep.c', + 'pep.h', + 'ping.c', + 'ping.h', + 'presence.c', + 'presence.h', + 'roster.c', + 'roster.h', + 'si.c', + 'si.h', + 'useravatar.c', + 'useravatar.h', + 'usermood.c', + 'usermood.h', + 'usernick.c', + 'usernick.h', + 'usertune.c', + 'usertune.h', + 'xdata.c', + 'xdata.h', + 'xmpp.c', + 'xmpp.h' +] + +if USE_CYRUS_SASL + JABBERSOURCES += ['auth_cyrus.c'] +endif + +if IS_WIN32 + JABBERSOURCES += ['win32/posix.uname.c'] +endif + +if STATIC_JABBER + jabber_prpl = static_library('jabber', JABBERSOURCES, + include_directories : [toplevel_inc, libpurple_inc], + c_args : '-DPURPLE_STATIC_PRPL', + link_with : libpurple, + dependencies : [gstreamer, idn, libxml, sasl, gplugin, glib, gio, math]) +elif DYNAMIC_JABBER + jabber_prpl = shared_library('jabber', JABBERSOURCES, + include_directories : [toplevel_inc, libpurple_inc], + link_with : libpurple, + dependencies : [gstreamer, idn, libxml, sasl, gplugin, glib, gio, math], + install : true, install_dir : PURPLE_PLUGINDIR) +endif + +subdir('tests')
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libpurple/protocols/jabber/tests/meson.build Mon Aug 22 04:24:11 2016 -0400 @@ -0,0 +1,11 @@ +# FIXME: 'jutil' can't find an inline function while linking. + +foreach prog : ['caps', 'digest_md5', 'scram'] + e = executable( + 'test_jabber_' + prog, 'test_jabber_@0@.c'.format(prog), + include_directories : [toplevel_inc, libpurple_inc], + link_with : [jabber_prpl, libpurple], + dependencies : [libxml, gplugin, glib]) + + test('jabber_' + prog, e) +endforeach
--- a/libpurple/protocols/meson.build Mon Aug 22 04:07:00 2016 -0400 +++ b/libpurple/protocols/meson.build Mon Aug 22 04:24:11 2016 -0400 @@ -2,7 +2,7 @@ subdir('facebook') subdir('gg') subdir('irc') -#subdir('jabber') +subdir('jabber') #subdir('msn') #subdir('mxit') #subdir('novell')
--- a/meson.build Mon Aug 22 04:07:00 2016 -0400 +++ b/meson.build Mon Aug 22 04:24:11 2016 -0400 @@ -71,6 +71,7 @@ conf = configuration_data() version_conf = configuration_data() +conf.set('PACKAGE', '"@0@"'.format(meson.project_name())) conf.set('VERSION', '"@0@"'.format(purple_display_version)) version_conf.set('PURPLE_MAJOR_VERSION', purple_major_version)