summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsonOfRa <simon-github@slevermann.de>2014-02-20 14:33:31 +0100
committerSimon Levermann <simon@levermaenner.de>2014-02-20 17:18:40 +0100
commitb9825218fc15b20504f7484460a35479a9c6bce1 (patch)
tree38d16f4595c2c020c592dc2f1a8f513d03d4baa6
parent0a73a6268921f97eb2ee3a2fb8febdcd2869b28e (diff)
Add a configure flag for disabling soname versions
The loader on Android cannot deal with soname versions properly. To circumvent this problem, libtool has a -avoid-version flag that does not versionate the shared libraries. To disable soname versions, "./configure --disable-soname". Soname versions are enabled by default, as only Android needs to disable them
-rw-r--r--configure.ac21
1 files changed, 16 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 066c919a..1540360e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,11 +22,6 @@ dnl revision: increment if source code has changed, set to zero if current is
22dnl incremented 22dnl incremented
23dnl age: increment if interfaces have been added, set to zero if 23dnl age: increment if interfaces have been added, set to zero if
24dnl interfaces have been removed or changed 24dnl interfaces have been removed or changed
25TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
26TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION"
27
28AC_SUBST(TOXCORE_LT_LDFLAGS)
29AC_SUBST(TOXAV_LT_LDFLAGS)
30 25
31if test "x${prefix}" = "xNONE"; then 26if test "x${prefix}" = "xNONE"; then
32 prefix="${ac_default_prefix}" 27 prefix="${ac_default_prefix}"
@@ -44,6 +39,22 @@ LIBCONFIG_FOUND="no"
44LIBCHECK_FOUND="no" 39LIBCHECK_FOUND="no"
45WANT_NACL="no" 40WANT_NACL="no"
46 41
42TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION"
43TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION"
44
45AC_ARG_ENABLE([soname-versions],
46 [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ],
47 [
48 if test "x$enableval" = "xno"; then
49 TOXCORE_LT_LDFLAGS="-avoid-version"
50 TOXAV_LT_LDFLAGS="-avoid-version"
51 fi
52 ]
53)
54
55AC_SUBST(TOXCORE_LT_LDFLAGS)
56AC_SUBST(TOXAV_LT_LDFLAGS)
57
47AC_ARG_ENABLE([nacl], 58AC_ARG_ENABLE([nacl],
48 [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ], 59 [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ],
49 [ 60 [