Mercurial > pidgin
changeset 27525:b32e7be9b3bf
merge of '13a2e99b338b6f766d19c7ad7cce26b8b32c9e99'
and '1d2c8afb03d9a78cbb34feab5b56b58e2a679e4b'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 13 Jul 2009 02:29:40 +0000 |
| parents | b0ae684202a8 (diff) a9eb6dbbba1b (current diff) |
| children | 07cb59d47685 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Mon Jul 13 02:28:34 2009 +0000 +++ b/configure.ac Mon Jul 13 02:29:40 2009 +0000 @@ -1075,13 +1075,19 @@ load_proto= for i in $STATIC_PRPLS ; do dnl Ugly special case for "libsilcpurple.la": - dnl ... and Ugly special case for multi-protocol oscar + dnl ... and Ugly special case for multi-protocol oscar and yahoo if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" extern_init="$extern_init extern gboolean purple_init_aim_plugin();" extern_init="$extern_init extern gboolean purple_init_icq_plugin();" load_proto="$load_proto purple_init_aim_plugin();" load_proto="$load_proto purple_init_icq_plugin();" + elif test "x$i" = "xyahoo"; then + STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la" + extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();" + extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();" + load_proto="$load_proto purple_init_yahoo_plugin();" + load_proto="$load_proto purple_init_yahoojp_plugin();" else if test "x$i" = "xsilc"; then STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la"
--- a/libpurple/protocols/yahoo/Makefile.am Mon Jul 13 02:28:34 2009 +0000 +++ b/libpurple/protocols/yahoo/Makefile.am Mon Jul 13 02:29:40 2009 +0000 @@ -33,7 +33,7 @@ if STATIC_YAHOO st = -DPURPLE_STATIC_PRPL -noinst_LTLIBRARIES = libyahoo.la +noinst_LTLIBRARIES = libymsg.la libymsg_la_SOURCES = $(YAHOOSOURCES) libyahoo.c libyahoojp.c libymsg_la_CFLAGS = $(AM_CFLAGS)