diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-23 12:01:26 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-09 13:05:29 +0000 |
| commit | a167423acad1bbc41d764710fbc1de4347906da6 (patch) | |
| tree | ac1a101f7bbe1d3d66b535826cd7a5d721c8ae0a | |
| parent | 9a52bb20676a5290b3778cecb9d5bbc74a928db7 (diff) | |
Build Wocky as a version-specific shared library
Reviewed-by: Olli Salli <olli.salli@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46417
| -rw-r--r-- | configure.ac | 11 | ||||
| m--------- | lib/ext/wocky | 0 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
3 files changed, 8 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 522accb14..4690d117b 100644 --- a/configure.ac +++ b/configure.ac @@ -314,16 +314,7 @@ AM_CONDITIONAL([WANT_TWISTED_TESTS], test false != "$TEST_PYTHON") # 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}" - -# Code from the submodules will be linked in to the gabble-plugins.so shared library, so they need -# to be compiled as position-independent code. Pass on any other flags we got as well. -# -# On some platforms -fPIC results in a "all code is position independent" warning though, so let's -# try to compile with -Werror to find out if the current platform is one of these. -sub_cflags="$CFLAGS" -TP_COMPILER_FLAG([-fPIC -Werror], [sub_cflags+=" -fPIC"]) -ac_configure_args+=" CFLAGS=\"$sub_cflags\"" +ac_configure_args="$ac_configure_args --with-installed-headers=${wocky_install_headers_dir} --enable-shared-suffix=${PACKAGE}-${VERSION}" if test "x$ENABLE_CODING_STYLE_CHECKS" = xyes ; then ac_configure_args+=" --enable-coding-style-checks" diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject 81fe73ceb5b0693a92c2247bdb1da11b363b79d +Subproject 520016c06c3c7440c925bde233842deafce7620 diff --git a/src/Makefile.am b/src/Makefile.am index a0bf5d99a..3257b659c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -241,7 +241,13 @@ noinst_LTLIBRARIES = libgabble-convenience.la lib_LTLIBRARIES = libgabble-plugins.la -libgabble_plugins_la_LDFLAGS = -shared -no-undefined -avoid-version +# Gabble's plugin API is not stable yet (it can't be, since neither is Wocky), +# so use -release to make the SONAME of the plugin library change with every +# Gabble release. +libgabble_plugins_la_LDFLAGS = \ + -no-undefined \ + -release $(VERSION) \ + $(NULL) libgabble_plugins_la_LIBADD = \ $(ALL_LIBS) |