summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2013-07-31 15:55:25 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2013-07-31 15:55:25 +0000
commit5e5bcb4c415bf9dfbc37d7a6bdf4e2482660ea72 (patch)
treead5edbb65e6de0a00af729e826315f4690532555
parent8b42afd93c8256dc2de5684a08bd8deebd00515f (diff)
downloadneon-5e5bcb4c415bf9dfbc37d7a6bdf4e2482660ea72.tar.gz
* macros/neon.m4, configure.in: Fix ABI versioning for backwards-compat
with 0.27.x. git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1930 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
-rw-r--r--configure.in7
-rw-r--r--macros/neon.m410
2 files changed, 6 insertions, 11 deletions
diff --git a/configure.in b/configure.in
index 65985ce..37b14ec 100644
--- a/configure.in
+++ b/configure.in
@@ -143,9 +143,10 @@ AC_SUBST(NEON_PC_LIBS)
# Pass the interface version on to libtool when linking libneon.la
NEON_LINK_FLAGS="-version-info ${NE_LIBTOOL_VERSINFO}"
# If any non-default ABI variations are used, add them to the SONAME:
-if test "x${NE_LIBTOOL_RELEASE}y" != "xy"; then
- NEON_LINK_FLAGS="${NEON_LINK_FLAGS} -release ${NE_LIBTOOL_RELEASE}"
-fi
+### disabled for backwards-compat with 0.27.x
+#if test "x${NE_LIBTOOL_RELEASE}y" != "xy"; then
+# NEON_LINK_FLAGS="${NEON_LINK_FLAGS} -release ${NE_LIBTOOL_RELEASE}"
+#fi
gl_LD_VERSION_SCRIPT
# If ld version scripts are supported, enable symbol versioning.
diff --git a/macros/neon.m4 b/macros/neon.m4
index 6d47333..92f76bf 100644
--- a/macros/neon.m4
+++ b/macros/neon.m4
@@ -140,14 +140,8 @@ NE_VERSION_MINOR=30
NE_VERSION_PATCH=0
NE_VERSION_TAG=
-# libtool library interface versioning. Release policy dictates that
-# for neon 0.x.y, each x brings an incompatible interface change, and
-# each y brings no interface change, and since this policy has been
-# followed since 0.1, x == CURRENT, y == RELEASE, 0 == AGE. For
-# 1.x.y, this will become N + x == CURRENT, y == RELEASE, x == AGE,
-# where N is constant (and equal to CURRENT + 1 from the final 0.x
-# release)
-NE_LIBTOOL_VERSINFO="${NE_VERSION_MINOR}:${NE_VERSION_PATCH}:0"
+# 0.30.x is backwards-compatible to 0.27.x, so AGE=3
+NE_LIBTOOL_VERSINFO="30:${NE_VERSION_PATCH}:3"
NE_DEFINE_VERSIONS