diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-09-26 10:41:59 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-09-26 10:47:34 +0200 |
| commit | d6d1e2fb706c73be240e26a1d634f9139d090f3f (patch) | |
| tree | dcce66efa215539566647d59556e98a8bbf36578 | |
| parent | 127784d6af35b4b8ce4b9b15385e23afffd140bc (diff) | |
Explicitely link on Farstream
We are using Farstream API.
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dc396f7..42fa619 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,12 @@ PKG_CHECK_MODULES(TP_FARSTREAM, [telepathy-farstream >= 0.1.0]) AC_SUBST(TP_FARSTREAM_CFLAGS) AC_SUBST(TP_FARSTREAM_LIBS) +dnl Check for farstream +PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1]) + +AC_SUBST(FARSTREAM_CFLAGS) +AC_SUBST(FARSTREAM_LIBS) + dnl Always required to generate extensions AM_PATH_PYTHON([2.5]) diff --git a/src/Makefile.am b/src/Makefile.am index 9df8410..a20eb97 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,9 +21,9 @@ phoenix_authenticator_LDFLAGS = @GLIB_LIBS@ @TP_GLIB_LIBS@ phoenix_echo_call_SOURCES = echo-call.c \ echo-call-info-dbus.c echo-call-info-dbus.h phoenix_echo_call_CFLAGS = @GLIB_CFLAGS@ @TP_GLIB_CFLAGS@ \ - @TP_FARSTREAM_CFLAGS@ + @TP_FARSTREAM_CFLAGS@ @FARSTREAM_CFLAGS@ phoenix_echo_call_LDFLAGS = @GLIB_LIBS@ @TP_GLIB_LIBS@ \ - @TP_FARSTREAM_LIBS@ + @TP_FARSTREAM_LIBS@ @FARSTREAM_LIBS@ phoenix: phoenix.in sed -e "s,[@]DATADIR[@],$(pkgdatadir)/data," \ |