diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-10 01:06:31 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-10 18:14:53 +0800 |
| commit | b144dca066162f1ece8de8c9762be8f5c19bcfa3 (patch) | |
| tree | ac861906be07c20da32efc40ecc2b1a1c609c606 | |
| parent | 8838f0c8bc0d835b4b76f8d28d5846e835b12496 (diff) | |
| download | gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.tar gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.tar.gz gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.tar.bz2 gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.tar.lz gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.tar.xz gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.tar.zst gsoc2013-empathy-b144dca066162f1ece8de8c9762be8f5c19bcfa3.zip | |
Only link empathy-av against farsight
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ffa272748..7d53cff4b 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 f545b6758..1b0d4e078 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 |