set up telepathy-yell in the gabble build system

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

4 files changed, 33 insertions, 8 deletions

diff --git a/autogen.sh b/autogen.sh
index b6dff981b..26e33cb71 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,10 +16,10 @@ fi
 
 autoreconf -i -f
 
-# Fetch Wocky if needed
-if test ! -f lib/ext/wocky/autogen.sh;
+# Fetch submodules if needed
+if test ! -f lib/ext/wocky/autogen.sh -o ! -f lib/ext/telepathy-yell/autogen.sh;
 then
-  echo "+ Setting up Wocky submodule"
+  echo "+ Setting up submodules"
   git submodule init
 fi
 git submodule update
@@ -29,6 +29,11 @@ cd lib/ext/wocky
 sh autogen.sh --no-configure
 cd ../../..
 
+# launch tp-yell's autogen.sh
+cd lib/ext/telepathy-yell
+sh autogen.sh --no-configure
+cd ../../..
+
 run_configure=true
 for arg in $*; do
     case $arg in
diff --git a/configure.ac b/configure.ac
index 66d3d0701..1801cf9a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,6 +242,8 @@ AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON")
 # separate Wocky installation won't clash with them. This is a bit of a hack.
 # AX_CONFIG_DIR doesn't make it very easy to pass extra arguments to the
 # submodule's configure.
+#
+# Also do this for telepathy-yell.
 prev_ac_configure_args=$ac_configure_args
 ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir}"
 
@@ -257,10 +259,16 @@ else
   ac_configure_args+=" --disable-Werror"
 fi
 
+dnl wocky
 prev_top_build_prefix=$ac_top_build_prefix
 AX_CONFIG_DIR([lib/ext/wocky])
 ac_top_build_prefix=$prev_top_build_prefix
 
+dnl tp-yell
+prev_top_build_prefix=$ac_top_build_prefix
+AX_CONFIG_DIR([lib/ext/telepathy-yell])
+ac_top_build_prefix=$prev_top_build_prefix
+
 ac_configure_args=$prev_ac_configure_args
 
 dnl Check for Wocky
@@ -270,6 +278,12 @@ PKG_CHECK_MODULES(WOCKY, wocky >= 0.0.0)
 AC_SUBST(WOCKY_CFLAGS)
 AC_SUBST(WOCKY_LIBS)
 
+dnl Check for tp-yell
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"lib/ext/telepathy-yell/telepathy-yell
+PKG_CHECK_MODULES(TP_YELL, telepathy-yell)
+AC_SUBST(TP_YELL_CFLAGS)
+AC_SUBST(TP_YELL_LIBS)
+
 dnl Check for libsoup
 PKG_CHECK_MODULES(SOUP, libsoup-2.4)
 AC_SUBST(SOUP_CFLAGS)
diff --git a/lib/ext/Makefile.am b/lib/ext/Makefile.am
index 48e4e2d5e..a7ac4dbf9 100644
--- a/lib/ext/Makefile.am
+++ b/lib/ext/Makefile.am
@@ -1,16 +1,21 @@
 SUBDIRS =
-DIST_SUBDIRS = wocky
+DIST_SUBDIRS = wocky telepathy-yell
 
 all-local:
 	@cd wocky && $(MAKE)
+	@cd telepathy-yell && $(MAKE)
 
 clean-local:
 	if test -e wocky/Makefile ; then \
 		cd wocky && $(MAKE) clean ; \
 	fi
 
+	if test -e telepathy-yell/Makefile ; then \
+		cd telepathy-yell && $(MAKE) clean ; \
+	fi
+
 uninstall-local:
-	@cd wocky/wocky && $(MAKE) uninstall
+	@cd telepathy-yell/telepathy-yell && $(MAKE) uninstall
 
 install-data-local:
-	@cd wocky/wocky && $(MAKE) install
+	@cd telepathy-yell/telepathy-yell && $(MAKE) install
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b81ca8a7..62ce0f707 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -225,13 +225,14 @@ AM_CFLAGS = $(ERROR_CFLAGS) -I$(top_srcdir) -I$(top_builddir) \
 	    @DBUS_CFLAGS@ @GLIB_CFLAGS@ @WOCKY_CFLAGS@ \
 	    @HANDLE_LEAK_DEBUG_CFLAGS@ @TP_GLIB_CFLAGS@ \
 	    @SOUP_CFLAGS@ @NICE_CFLAGS@ @GMODULE_CFLAGS@ \
-	    @SQLITE_CFLAGS@ \
+	    @SQLITE_CFLAGS@ @TP_YELL_CFLAGS@ \
 	    -I $(top_srcdir)/lib -I $(top_builddir)/lib \
 	    -DG_LOG_DOMAIN=\"gabble\" \
 	    -DPLUGIN_DIR=\"$(libdir)/telepathy/gabble-0\"
 
 ALL_LIBS =  @DBUS_LIBS@ @GLIB_LIBS@ @WOCKY_LIBS@ @TP_GLIB_LIBS@ \
-	    @SOUP_LIBS@ @NICE_LIBS@ @GMODULE_LIBS@ @SQLITE_LIBS@
+	    @SOUP_LIBS@ @NICE_LIBS@ @GMODULE_LIBS@ @SQLITE_LIBS@ \
+	    @TP_YELL_LIBS@
 
 # build gibber first
 all: gibber