diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 15:26:19 +0800 |
| commit | 894b1f315b62499a5d305aff6b937093a20df1a4 (patch) | |
| tree | 8cecdaff46a2ee3360f9e676d11672c388a23082 /configure.ac | |
| parent | 58574c8dc2e5261d8c89b9a6b6fda41687a386ea (diff) | |
| parent | 1af2b9b657046268d0a44fd2aa588ea281ad1f20 (diff) | |
| download | gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.gz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.bz2 gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.lz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.xz gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.tar.zst gsoc2013-empathy-894b1f315b62499a5d305aff6b937093a20df1a4.zip | |
Merge remote-tracking branch 'origin/call1' into master+call
Conflicts:
configure.ac
telepathy-yell
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 32459f543..68e50444b 100644 --- a/configure.ac +++ b/configure.ac @@ -74,15 +74,6 @@ AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated]) # FIXME: bgo #669673 AC_DEFINE(CLUTTER_DISABLE_DEPRECATION_WARNINGS, 1, [Build with Clutter deprecated]) -# telepathy-yell -prev_top_build_prefix=$ac_top_build_prefix -prev_ac_configure_args=$ac_configure_args -ac_configure_args="$ac_configure_args --disable-shared-library" -AX_CONFIG_DIR([telepathy-yell]) -ac_top_build_prefix=$prev_top_build_prefix -ac_configure_args=$prev_ac_configure_args -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell - AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([configure.ac]) @@ -206,8 +197,6 @@ PKG_CHECK_MODULES(EMPATHY, libsoup-2.4 ]) -PKG_CHECK_MODULES(YELL, [telepathy-yell]) - PKG_CHECK_MODULES(EMPATHY_AV, [ farsight2-0.10 @@ -227,8 +216,8 @@ AC_ARG_ENABLE(call, if test "x$enable_call" != "xno" ; then PKG_CHECK_MODULES(EMPATHY_CALL, [ - farsight2-0.10 - telepathy-farstream >= 0.1.2 + farstream-0.1 + telepathy-farstream >= 0.2.0 clutter-1.0 >= $CLUTTER_REQUIRED clutter-gtk-1.0 clutter-gst-1.0 |