[empathy/gnome-2-34] Only link empathy-av against farsight
- From: Emilio Pozuelo Monfort <epm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy/gnome-2-34] Only link empathy-av against farsight
- Date: Thu, 10 Feb 2011 10:27:00 +0000 (UTC)
commit b144dca066162f1ece8de8c9762be8f5c19bcfa3
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Wed Feb 9 17:06:31 2011 +0000
Only link empathy-av against farsight
configure.ac | 8 ++++++--
src/Makefile.am | 3 +++
2 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ffa2727..7d53cff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,6 @@ AC_SUBST(ERROR_CFLAGS)
PKG_CHECK_MODULES(EMPATHY,
[
dbus-glib-1
- farsight2-0.10
folks >= $FOLKS_REQUIRED
folks-telepathy >= $FOLKS_REQUIRED
gconf-2.0 >= $GCONF_REQUIRED
@@ -152,12 +151,17 @@ PKG_CHECK_MODULES(EMPATHY,
gstreamer-0.10
gstreamer-interfaces-0.10
libxml-2.0
- telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
telepathy-logger-0.1 >= $TELEPATHY_LOGGER
x11
])
+PKG_CHECK_MODULES(EMPATHY_AV,
+[
+ farsight2-0.10
+ telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
+])
+
# -----------------------------------------------------------
# evolution-data-server (about-me)
# -----------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index f545b67..1b0d4e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -125,6 +125,9 @@ empathy_av_SOURCES = \
nodist_empathy_av_SOURCES = $(BUILT_SOURCES)
+empathy_av_CFLAGS = $(EMPATHY_AV_CFLAGS)
+empathy_av_LDFLAGS = $(EMPATHY_AV_LIBS)
+
empathy_auth_client_SOURCES = \
empathy-auth-client.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]