/pidgin/main: c0d0b7137c8a: Fix the FARSIGHT libs and cflags for...
Mark Doliner
mark at kingant.net
Fri Aug 30 02:02:05 EDT 2013
Changeset: c0d0b7137c8ab83fe7003cfa0999cb3990826965
Author: Mark Doliner <mark at kingant.net>
Date: 2013-08-29 22:59 -0700
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/c0d0b7137c8a
Description:
Fix the FARSIGHT libs and cflags for the jabber prpl.
We never define FARSIGHT_LIBS or FARSIGHT_CFLAGS. We only ever define
FARSTREAM_LIBS and FARSTREAM_CFLAGS, even if they point to farsight.
I'm assuming this hasn't been a problem because:
1. The variables are allowed to be empty (it's not treated as an error)
2. libpurple and/or Pidgin link against farsight/farstream, so it's
apparently not necessary for the plugin to do it itself? Who knew.
diffstat:
libpurple/protocols/jabber/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (19 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
@@ -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)
More information about the Commits
mailing list