summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-09 13:35:37 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-03-23 14:11:37 +0000
commitf06469da5cfc7c8dc750bce82099dde4b528a20b (patch)
tree9b931684acd30b6e4186fafe818788d6d7907905 /configure.ac
parentc535a29358002b3b48c3df7bedecfbf73ab4553f (diff)
Install non-ABI-stable libraries used by plugins to a private directory
This avoids having Gabble and Salut, or old Gabble and a future stable Wocky, fight over the libwocky.so symlink. If you're building for a tightly controlled platform where Gabble and Salut are definitely using the same Wocky version, you can put them in the normal libdir with ./configure pluginexeclibdir='${libdir}' or (when Salut has been updated with this change) make them share a private library directory: ./configure pluginexeclibdir='${libdir}/telepathy/ytstenut-1.0' Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46417 Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac12
1 files changed, 11 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 119c1207e..08922eda8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,6 +238,15 @@ AC_SUBST(GLIB_LIBS)
GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
AC_SUBST(GLIB_GENMARSHAL)
+# These must contain "exec" for automake to work right (install-exec,
+# not install-data).
+#
+# Private directory for Wocky and the gabble-plugins library
+if test "x$pluginexeclibdir" = x; then
+ pluginexeclibdir='${libdir}/telepathy/gabble-0/lib'
+fi
+AC_ARG_VAR([pluginexeclibdir])
+
AC_ARG_ENABLE(plugins,
AC_HELP_STRING([--disable-plugins],
[disable plugin loader]),
@@ -321,7 +330,8 @@ fi
# 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} --enable-shared-suffix=${PACKAGE}-${VERSION}"
+
+ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir} --enable-shared-suffix=${PACKAGE}-${VERSION} --libdir=${pluginexeclibdir}"
if test "x$ENABLE_CODING_STYLE_CHECKS" = xyes ; then
ac_configure_args="$ac_configure_args --enable-coding-style-checks"