Mon, 01 Mar 2010 03:46:33 +0000
propagate from branch 'im.pidgin.pidgin' (head ad7890a74433d4988573c3314dc452b0010f21d4)
to branch 'im.pidgin.cpw.rekkanoryo.ggupdate' (head 4101af714b47fdba8a010bef0ca5b10eb6b95aec)
--- a/configure.ac Sun Feb 28 23:42:12 2010 +0000 +++ b/configure.ac Mon Mar 01 03:46:33 2010 +0000 @@ -2583,6 +2583,7 @@ echo Build with Cyrus SASL support. : $enable_cyrus_sasl echo Use kerberos 4 with zephyr.... : $kerberos echo Use external libzephyr........ : $zephyr +echo Use external libgadu.......... : $gadu_libs echo Install pixmaps............... : $enable_pixmaps echo Install translations.......... : $enable_i18n echo Has you....................... : yes
--- a/libpurple/protocols/gg/Makefile.am Sun Feb 28 23:42:12 2010 +0000 +++ b/libpurple/protocols/gg/Makefile.am Mon Mar 01 03:46:33 2010 +0000 @@ -4,14 +4,19 @@ lib/compat.h \ lib/COPYING \ lib/dcc.c \ + lib/dcc7.c \ lib/events.c \ lib/http.c \ lib/libgadu.c \ lib/libgadu-config.h \ lib/libgadu.h \ lib/obsolete.c \ + lib/protocol.h \ + lib/pubdir.c \ lib/pubdir50.c \ - lib/pubdir.c + lib/resolver.c \ + lib/resolver.h \ + lib/sha1.c pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) @@ -20,16 +25,21 @@ lib/common.c \ lib/compat.h \ lib/dcc.c \ + lib/dcc7.c \ lib/events.c \ lib/http.c \ lib/libgadu.c \ lib/libgadu-config.h \ lib/libgadu.h \ lib/obsolete.c \ + lib/protocol.h \