1 files changed, 5 insertions, 18 deletions

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)]) ],