pidgin.2.x.y: 5cfaf8db: Unless I'm missing something really obvi...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 5cfaf8dbfb30d9eebc0b6fb03cfb361557ad3724
Parent:   3f0fa1ca9cfec741a0ca57563011468898c43064
Author:   rekkanoryo at pidgin.im
Date:     10/01/11 19:20:49
Branch:   im.pidgin.pidgin.2.x.y
URL: http://d.pidgin.im/viewmtn/revision/info/5cfaf8dbfb30d9eebc0b6fb03cfb361557ad3724

Changelog: 

Unless I'm missing something really obvious, this should fix #14544 by telling
the compiler where to find GNUTLS headers.  It should also allow the gg prpl to
be linked against GNUTLS if we're using an external libgadu.

Changes against parent 3f0fa1ca9cfec741a0ca57563011468898c43064

  patched  libpurple/protocols/gg/Makefile.am

-------------- next part --------------
============================================================
--- libpurple/protocols/gg/Makefile.am	6cbbf3fb73d1fdb01e5a3f67751765f7d9d55655
+++ libpurple/protocols/gg/Makefile.am	39591573cf2f0332ebafa1d1c19713b79b06ce9c
@@ -61,13 +61,13 @@ INTGG_CFLAGS = -I$(top_srcdir)/libpurple
 	lib/sha1.c
 
 INTGG_CFLAGS = -I$(top_srcdir)/libpurple/protocols/gg/lib -DGG_IGNORE_DEPRECATED -DUSE_INTERNAL_LIBGADU
+endif
 
 if USE_GNUTLS
 GADU_LIBS += $(GNUTLS_LIBS)
+GADU_CFLAGS += $(GNUTLS_CFLAGS)
 endif
 
-endif
-
 GGSOURCES = \
 	$(INTGGSOURCES) \
 	gg-utils.h \