/soc/2013/ankitkv/gobjectification: 658670a20905: Merged default...

[Ankit Vani]

Changeset: 658670a209055834ff01eb0185bd4aa284070ae8
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-30 15:25 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/658670a20905

Description:

Merged default branch

diffstat:

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

diffs (57 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -984,14 +984,14 @@ if test "x$enable_farstream" != "xno"; t
 		PKG_CHECK_MODULES(FARSTREAM, [farstream-0.2], [
 			AC_SUBST(FARSTREAM_CFLAGS)
 			AC_SUBST(FARSTREAM_LIBS)
- 		], [
+		], [
 		        enable_farstream="no"
 		])
 	else
 		PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [
 			AC_SUBST(FARSTREAM_CFLAGS)
 			AC_SUBST(FARSTREAM_LIBS)
- 		], [
+		], [
 			# Try farsight.
 			PKG_CHECK_MODULES(FARSTREAM, [farsight2-0.10 >= 0.0.9], [
 			        AC_DEFINE(HAVE_FARSIGHT, 1, [Use Farsight instead of Farstream])
@@ -1000,7 +1000,7 @@ if test "x$enable_farstream" != "xno"; t
 			], [
 			        enable_farstream="no"
 			])
- 		])
+		])
 	fi
 fi
 
@@ -1487,7 +1487,7 @@ fi
 DEBUG_CPPFLAGS=`echo "$DEBUG_CFLAGS" | $sedpath 's/-Wdeclaration-after-statement//' | $sedpath 's/-Wmissing-prototypes//' | $sedpath 's/-Waggregate-return//'`
 
 if test "x$SUNCC" = "xyes"; then
-        CFLAGS="$CFLAGS -features=extensions" 
+        CFLAGS="$CFLAGS -features=extensions"
 fi
 AC_SUBST(CFLAGS)
 
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
@@ -114,7 +114,7 @@ st =
 pkg_LTLIBRARIES      = libjabber.la libfacebook.la libgtalk.la libxmpp.la
 libjabber_la_SOURCES = $(JABBERSOURCES)
 libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)\
-	$(FARSIGHT_LIBS) \
+	$(FARSTREAM_LIBS) \
 	$(GSTREAMER_LIBS)
 
 libfacebook_la_SOURCES = libfacebook.c
@@ -135,5 +135,5 @@ AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
 	$(IDN_CFLAGS) \
 	$(LIBXML_CFLAGS) \
-	$(FARSIGHT_CFLAGS) \
+	$(FARSTREAM_CFLAGS) \
 	$(GSTREAMER_CFLAGS)