Check for telepathy-yell if requested
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Fri, 18 Feb 2011 15:49:24 +0000 (15:49 +0000)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Wed, 8 Jun 2011 14:10:19 +0000 (15:10 +0100)
autogen.sh
configure.ac

index bb0d1f8..7c73adb 100755 (executable)
@@ -17,6 +17,18 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME GIT"
     exit 1
 }
-USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
 
+# Fetch submodules if needed
+if test ! -f telepathy-yell/autogen.sh;
+then
+  echo "+ Setting up submodules"
+  git submodule init
+fi
+git submodule update
+
+# launch tp-yell's autogen.sh
+cd telepathy-yell
+sh autogen.sh --no-configure
+cd ..
 
+USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
index 1692810..714133e 100644 (file)
@@ -62,6 +62,12 @@ GNOME_CONTROL_CENTER_REQUIRED=2.31.4
 #ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 #GNOME_MAINTAINER_MODE_DEFINES
 
+# telepathy-yell
+prev_top_build_prefix=$ac_top_build_prefix
+AX_CONFIG_DIR([telepathy-yell])
+ac_top_build_prefix=$prev_top_build_prefix
+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])
@@ -172,6 +178,17 @@ PKG_CHECK_MODULES(EMPATHY_AV,
    telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
 ])
 
+# -----------------------------------------------------------
+# Call interface
+# -----------------------------------------------------------
+AC_ARG_WITH(call,
+            AC_HELP_STRING([--with-call], [build with Call interface support]),,
+            [with_call=yes])
+if test "x$with_call" = "xyes" ; then
+   PKG_CHECK_MODULES(YELL, [telepathy-yell])
+   AC_DEFINE(HAVE_CALL, 1, [Define if we have Call interface support])
+fi
+
 # -----------------------------------------------------------
 # evolution-data-server (about-me)
 # -----------------------------------------------------------