diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-02-08 14:42:20 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-02-08 14:42:20 +0000 |
| commit | ebdffdf082dc15538815517970c5af10184b1115 (patch) | |
| tree | e907113f567fc7c7fdf920582fae138861085e13 | |
| parent | d09a602e12e25484dce07a22973fbbc111b7ae3d (diff) | |
| download | telepathy-salut-ebdffdf082dc15538815517970c5af10184b1115.tar.gz | |
salut: include wocky as part of the salut plugin API
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | salut/telepathy-salut-uninstalled.pc.in | 2 |
2 files changed, 21 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index dd73d65f..22d6d801 100644 --- a/configure.ac +++ b/configure.ac @@ -217,7 +217,10 @@ if test x$enable_plugins = xyes; then AC_ARG_ENABLE(plugin-api, AC_HELP_STRING([--enable-plugin-api], [install headers for third-party plugins (experimental)]), - [enable_plugin_api=$enableval], + [ + enable_plugin_api=$enableval + wocky_install_headers_dir="${includedir}/telepathy-salut-0" + ], [enable_plugin_api=no]) fi @@ -235,7 +238,23 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [ HAVE_CHECK=no ] ) AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") +# We have to run Wocky's configure *before* looking for it with +# PKG_CHECK_MODULES so wocky-uninstalled.pc has been generated + +# We tell Wocky to install its headers alongside gabble's so that an actual +# 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. + +prev_ac_configure_args=$ac_configure_args +ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir}" + +prev_top_build_prefix=$ac_top_build_prefix AX_CONFIG_DIR([lib/ext/wocky]) +ac_top_build_prefix=$prev_top_build_prefix + +ac_configure_args=$prev_ac_configure_args + PKG_CONFIG_PATH="${PKG_CONFIG_PATH:+"$PKG_CONFIG_PATH:"}${ac_abs_top_builddir}/lib/ext/wocky/wocky" export PKG_CONFIG_PATH PKG_CHECK_MODULES([WOCKY], [wocky >= 0.0.0]) diff --git a/salut/telepathy-salut-uninstalled.pc.in b/salut/telepathy-salut-uninstalled.pc.in index 94b78199..92cbc46c 100644 --- a/salut/telepathy-salut-uninstalled.pc.in +++ b/salut/telepathy-salut-uninstalled.pc.in @@ -11,4 +11,4 @@ Description: XMPP backend for the Telepathy framework (uninstalled) Version: @VERSION@ Requires: pkg-config >= 0.21 Requires.private: glib-2.0 >= 2.16, gobject-2.0 >= 2.16, telepathy-glib >= 0.13.12 -Cflags: -I${abs_top_srcdir} +Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/lib/ext/wocky |