/soc/2013/ashmew2/filetransferX: 124d99f639fa: A more correct wa...

[Mark Doliner]

Changeset: 124d99f639faf9552a1579bd4cafaf5229731fdb
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-08-29 23:03 -0700
Branch:	 filetransferX
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferX/rev/124d99f639fa

Description:

A more correct way to link against libnice.

We'll have to decide how we want to handle this dependency...
Whether we should make it optional, in which case we would
maybe disable GTalk FT if libnice isn't available.

Or if we think libnice is useful for other reasons we could
make it required.

diffstat:

 libpurple/protocols/jabber/Makefile.am |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (31 lines):

diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -93,8 +93,7 @@ JABBERSOURCES = \
 
 AM_CFLAGS = $(st)
 
-# TODO: Move -lnice to configure.ac!
-libxmpp_la_LDFLAGS = -module -avoid-version -lnice
+libxmpp_la_LDFLAGS = -module -avoid-version
 
 if USE_CYRUS_SASL
 JABBERSOURCES += auth_cyrus.c
@@ -115,7 +114,8 @@ libjabber_la_SOURCES = $(JABBERSOURCES)
 libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
 	$(FARSIGHT_LIBS) \
 	$(GSTREAMER_LIBS) \
-	$(GSTINTERFACES_LIBS)
+	$(GSTINTERFACES_LIBS) \
+	$(LIBNICE_LIBS)
 
 libxmpp_la_SOURCES = libxmpp.c
 libxmpp_la_LIBADD = libjabber.la
@@ -128,6 +128,7 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(IDN_CFLAGS) \
+	$(LIBNICE_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(FARSIGHT_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \