changeset 26363:88f413d12917

merge of '25cc5bdbbd9c509be202ab9847764b104f848577' and '7bc60f1fd2abbf238f52a98f1f26da74ca462705'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 24 Mar 2009 06:09:35 +0000
parents e9b5d68887ff (current diff) df353f24783d (diff)
children e114ed3c8cfe
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/Makefile.am	Tue Mar 24 06:06:07 2009 +0000
+++ b/libpurple/Makefile.am	Tue Mar 24 06:09:35 2009 +0000
@@ -280,6 +280,7 @@
 	$(NETWORKMANAGER_LIBS) \
 	$(INTLLIBS) \
 	$(FARSIGHT_LIBS) \
+	$(GSTPROPS_LIBS) \
 	$(GSTREAMER_LIBS) \
 	-lm
 
@@ -294,6 +295,7 @@
 	$(DBUS_CFLAGS) \
 	$(LIBXML_CFLAGS) \
 	$(FARSIGHT_CFLAGS) \
+	$(GSTPROPS_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(NETWORKMANAGER_CFLAGS)