/soc/2013/ashmew2/filetransferX: 8bbe5e3a5915: Test commit for d...

[Ashish Gupta]

Changeset: 8bbe5e3a59157ef81cdfd9d6acfe43fa058203ae
Author:	 Ashish Gupta <ashmew2 at gmail.com>
Date:	 2013-09-08 14:16 +0530
Branch:	 filetransferX
URL: https://hg.pidgin.im/soc/2013/ashmew2/filetransferX/rev/8bbe5e3a5915

Description:

Test commit for different heads

diffstat:

 configure.ac                           |  19 +++++++++++++++++++
 libpurple/protocols/jabber/Makefile.am |   6 ++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diffs (59 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -830,6 +830,25 @@ fi
 AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno")
 
 dnl #######################################################################
+dnl # Check for libnice
+dnl #######################################################################
+PKG_CHECK_MODULES(LIBNICE, nice, , [
+	AC_MSG_RESULT(no)
+	enable_libnice="no"
+	if test "x$force_deps" = "xyes" ; then
+		AC_MSG_ERROR([
+libnice development headers not found.
+Use --disable-libnice if you do not need it.
+])
+	fi])
+if test "x$enable_libnice" = "xyes" ; then
+	AC_DEFINE(USE_LIBNICE, 1, [Define if we're using libnice])
+	AC_SUBST(LIBNICE_CFLAGS)
+	AC_SUBST(LIBNICE_LIBS)
+fi
+
+
+dnl #######################################################################
 dnl # Check for Internationalized Domain Name support
 dnl #######################################################################
 
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,7 +93,7 @@ JABBERSOURCES = \
 
 AM_CFLAGS = $(st)
 
-libxmpp_la_LDFLAGS = -module -avoid-version -lnice
+libxmpp_la_LDFLAGS = -module -avoid-version
 
 if USE_CYRUS_SASL
 JABBERSOURCES += auth_cyrus.c
@@ -114,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
@@ -127,6 +128,7 @@ AM_CPPFLAGS = \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(IDN_CFLAGS) \
+	$(LIBNICE_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(FARSIGHT_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \