8 files changed, 62 insertions, 22 deletions

diff --git a/Makefile.am b/Makefile.am
index 4a204135..300c5c07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@ EXTRA_DIST = \
         README.md \
         libtoxcore.pc.in \
         tox.spec \
+        so.version \
         dist-build/android-arm.sh \
         dist-build/android-armv7.sh \
         dist-build/android-x86.sh \
diff --git a/build/Makefile.am b/build/Makefile.am
index ea844b3f..e4f36509 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -4,6 +4,18 @@ lib_LTLIBRARIES =
 noinst_bindir = $(top_builddir)/build
 EXTRA_DIST=
 
+if SET_SO_VERSION
+
+include ../so.version
+
+LT_LDFLAGS=-version-info $(CURRENT):$(REVISION):$(AGE)
+
+else
+
+LT_LDFLAGS=-avoid-version
+
+endif
+
 include ../toxcore/Makefile.inc
 include ../toxdns/Makefile.inc
 include ../toxencryptsave/Makefile.inc
diff --git a/configure.ac b/configure.ac
index bdf64dc2..8efffef0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,16 +12,6 @@ AC_CONFIG_MACRO_DIR([m4])
 
 EXTRA_LT_LDFLAGS=
 
-LIBTOXCORE_LT_VERSION=0:0:0
-dnl
-dnl            current:revision:age
-dnl
-dnl current:  increment if interfaces have been added, removed or changed
-dnl revision: increment if source code has changed, set to zero if current is
-dnl           incremented
-dnl age:      increment if interfaces have been added, set to zero if
-dnl           interfaces have been removed or changed
-
 if test "x${prefix}" = "xNONE"; then
     prefix="${ac_default_prefix}"
 fi
@@ -40,22 +30,19 @@ LIBCONFIG_FOUND="no"
 LIBCHECK_FOUND="no"
 WANT_NACL="no"
 ADD_NACL_OBJECTS_TO_PKGCONFIG="yes"
-
-TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
-TOXAV_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
+SET_SO_VERSION="yes"
 
 AC_ARG_ENABLE([soname-versions],
     [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ],
     [
         if test "x$enableval" = "xno"; then
-            TOXCORE_LT_LDFLAGS="-avoid-version"
-            TOXAV_LT_LDFLAGS="-avoid-version"
+            SET_SO_VERSION="no"
+        elif test "x$enableval" = "xyes"; then
+            SET_SO_VERSION="yes"
         fi
     ]
 )
-
-AC_SUBST(TOXCORE_LT_LDFLAGS)
-AC_SUBST(TOXAV_LT_LDFLAGS)
+AM_CONDITIONAL(SET_SO_VERSION, test "x$SET_SO_VERSION" = "xyes")
 
 AC_ARG_ENABLE([nacl],
     [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ],
diff --git a/so.version b/so.version
new file mode 100644
index 00000000..5c3a8be5
--- /dev/null
+++ b/so.version
@@ -0,0 +1,16 @@
+# .so library version, following the libtool scheme:
+#
+#            current:revision:age
+#
+# current:  increment if interfaces have been added, removed or changed
+# revision: increment if source code has changed, set to zero if current is
+#           incremented
+# age:      increment if interfaces have been added, set to zero if
+#           interfaces have been removed or changed
+#
+# For a full reference see:
+# https://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
+
+CURRENT=5
+REVISION=0
+AGE=4
diff --git a/toxav/Makefile.inc b/toxav/Makefile.inc
index b7669677..7b788198 100644
--- a/toxav/Makefile.inc
+++ b/toxav/Makefile.inc
@@ -29,7 +29,7 @@ libtoxav_la_CFLAGS = -I../toxcore \
                     $(AV_CFLAGS) \
                     $(PTHREAD_CFLAGS)
 
-libtoxav_la_LDFLAGS = $(TOXAV_LT_LDFLAGS) \
+libtoxav_la_LDFLAGS = $(LT_LDFLAGS) \
                     $(LIBSODIUM_LDFLAGS) \
                     $(NACL_LDFLAGS) \
                     $(EXTRA_LT_LDFLAGS) \
@@ -41,4 +41,10 @@ libtoxav_la_LIBADD =  libtoxcore.la \
                     $(PTHREAD_LIBS) \
                     $(AV_LIBS)
 
+if SET_SO_VERSION
+
+EXTRA_libtoxav_la_DEPENDENCIES = ../so.version
+
+endif
+
 endif
diff --git a/toxcore/Makefile.inc b/toxcore/Makefile.inc
index f30e6c06..f01a5d62 100644
--- a/toxcore/Makefile.inc
+++ b/toxcore/Makefile.inc
@@ -56,7 +56,7 @@ libtoxcore_la_CFLAGS =  -I$(top_srcdir) \
                         $(NACL_CFLAGS) \
                         $(PTHREAD_CFLAGS)
 
-libtoxcore_la_LDFLAGS = $(TOXCORE_LT_LDFLAGS) \
+libtoxcore_la_LDFLAGS = $(LT_LDFLAGS) \
                         $(EXTRA_LT_LDFLAGS) \
                         $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
@@ -68,3 +68,9 @@ libtoxcore_la_LIBADD =  $(LIBSODIUM_LIBS) \
                         $(NACL_OBJECTS) \
                         $(NAC_LIBS) \
                         $(PTHREAD_LIBS)
+
+if SET_SO_VERSION
+
+EXTRA_libtoxcore_la_DEPENDENCIES = ../so.version
+
+endif
diff --git a/toxdns/Makefile.inc b/toxdns/Makefile.inc
index 689a58a5..5b7c0123 100644
--- a/toxdns/Makefile.inc
+++ b/toxdns/Makefile.inc
@@ -14,7 +14,7 @@ libtoxdns_la_CFLAGS =   -I$(top_srcdir) \
                         $(NACL_CFLAGS) \
                         $(PTHREAD_CFLAGS)
 
-libtoxdns_la_LDFLAGS =  $(TOXCORE_LT_LDFLAGS) \
+libtoxdns_la_LDFLAGS =  $(LT_LDFLAGS) \
                         $(EXTRA_LT_LDFLAGS) \
                         $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
@@ -27,3 +27,9 @@ libtoxdns_la_LIBADD =   $(LIBSODIUM_LIBS) \
                         $(NAC_LIBS) \
                         $(PTHREAD_LIBS) \
                         libtoxcore.la
+
+if SET_SO_VERSION
+
+EXTRA_libtoxdns_la_DEPENDENCIES = ../so.version
+
+endif
diff --git a/toxencryptsave/Makefile.inc b/toxencryptsave/Makefile.inc
index 56bc101d..bde026cd 100644
--- a/toxencryptsave/Makefile.inc
+++ b/toxencryptsave/Makefile.inc
@@ -34,7 +34,7 @@ libtoxencryptsave_la_CFLAGS =   -I$(top_srcdir) \
                         $(NACL_CFLAGS) \
                         $(PTHREAD_CFLAGS)
 
-libtoxencryptsave_la_LDFLAGS =  $(TOXCORE_LT_LDFLAGS) \
+libtoxencryptsave_la_LDFLAGS =  $(LT_LDFLAGS) \
                         $(EXTRA_LT_LDFLAGS) \
                         $(LIBSODIUM_LDFLAGS) \
                         $(NACL_LDFLAGS) \
@@ -47,3 +47,9 @@ libtoxencryptsave_la_LIBADD =   $(LIBSODIUM_LIBS) \
                         $(NAC_LIBS) \
                         $(PTHREAD_LIBS) \
                         libtoxcore.la
+
+if SET_SO_VERSION
+
+EXTRA_libtoxencryptsave_la_DEPENDENCIES = ../so.version
+
+endif