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 17:24:55 +0800 |
| commit | add7f929cb12b88b2d3c4810b2d7b034196ddbdf (patch) | |
| tree | 9cc29110f4fb0b04d1d67d8055ea155919ba48aa | |
| parent | 07460f755936ac04bbe4a2ffc30914b840b9861b (diff) | |
| download | gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.tar gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.tar.gz gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.tar.bz2 gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.tar.lz gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.tar.xz gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.tar.zst gsoc2013-empathy-add7f929cb12b88b2d3c4810b2d7b034196ddbdf.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 fef5483ef..d15e72fb7 100644 --- 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 5f086ef40..86aff82d7 100644 --- 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) |