Only link empathy-av against farsight

diff --git a/configure.ac b/configure.ac
index fef5483ef6b7e76a9d9f569859629612d29149b1..d15e72fb75cefe805efd789b400dc3b251819fb0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,6 @@ AC_SUBST(ERROR_CFLAGS)
 PKG_CHECK_MODULES(EMPATHY,
 [
    dbus-glib-1
-   farsight2-0.10
    folks >= $FOLKS_REQUIRED
    folks-telepathy >= $FOLKS_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
@@ -158,7 +157,6 @@ 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
@@ -168,6 +166,12 @@ PKG_CHECK_MODULES(EMPATHY,
    gcr-3 >= $GCR_REQUIRED
 ])
 
+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 5f086ef40faa770758067949d3f660bf524ea671..86aff82d7e0d1ceb336bb038607f4a810fc0b93c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,6 +119,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 \
        $(NULL)