diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-18 23:49:24 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-08 22:10:19 +0800 |
| commit | 3784ae7edc461ba02536a69d367a2bb9c689b70b (patch) | |
| tree | 1e5a4c97e45a903a26de278c3d11f23cccf6111b | |
| parent | 24b58d60a04564fc839cc32a7c01d9fbb878e045 (diff) | |
| download | gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.tar gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.tar.gz gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.tar.bz2 gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.tar.lz gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.tar.xz gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.tar.zst gsoc2013-empathy-3784ae7edc461ba02536a69d367a2bb9c689b70b.zip | |
Check for telepathy-yell if requested
| -rwxr-xr-x | autogen.sh | 14 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 30 insertions, 1 deletions
diff --git a/autogen.sh b/autogen.sh index bb0d1f831..7c73adb9f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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 diff --git a/configure.ac b/configure.ac index 1692810bb..714133eac 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) @@ -173,6 +179,17 @@ PKG_CHECK_MODULES(EMPATHY_AV, ]) # ----------------------------------------------------------- +# 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) # ----------------------------------------------------------- AC_ARG_WITH(eds, |