diff options
author | irungentoo <irungentoo@tox.im> | 2014-02-20 16:33:43 -0500 |
---|---|---|
committer | irungentoo <irungentoo@tox.im> | 2014-02-20 16:33:43 -0500 |
commit | c84df4a4af080e5c465076afbab1b4aea5b4ded2 (patch) | |
tree | 38d16f4595c2c020c592dc2f1a8f513d03d4baa6 /configure.ac | |
parent | 0a73a6268921f97eb2ee3a2fb8febdcd2869b28e (diff) | |
parent | b9825218fc15b20504f7484460a35479a9c6bce1 (diff) |
Merge pull request #751 from sonOfRa/master
Add a configure flag for disabling soname versions
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 21 |
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 | |||
22 | dnl incremented | 22 | dnl incremented |
23 | dnl age: increment if interfaces have been added, set to zero if | 23 | dnl age: increment if interfaces have been added, set to zero if |
24 | dnl interfaces have been removed or changed | 24 | dnl interfaces have been removed or changed |
25 | TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" | ||
26 | TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION" | ||
27 | |||
28 | AC_SUBST(TOXCORE_LT_LDFLAGS) | ||
29 | AC_SUBST(TOXAV_LT_LDFLAGS) | ||
30 | 25 | ||
31 | if test "x${prefix}" = "xNONE"; then | 26 | if test "x${prefix}" = "xNONE"; then |
32 | prefix="${ac_default_prefix}" | 27 | prefix="${ac_default_prefix}" |
@@ -44,6 +39,22 @@ LIBCONFIG_FOUND="no" | |||
44 | LIBCHECK_FOUND="no" | 39 | LIBCHECK_FOUND="no" |
45 | WANT_NACL="no" | 40 | WANT_NACL="no" |
46 | 41 | ||
42 | TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" | ||
43 | TOXAV_LT_LDFLAGS="-version-info $LIBTOXAV_LT_VERSION" | ||
44 | |||
45 | AC_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 | |||
55 | AC_SUBST(TOXCORE_LT_LDFLAGS) | ||
56 | AC_SUBST(TOXAV_LT_LDFLAGS) | ||
57 | |||
47 | AC_ARG_ENABLE([nacl], | 58 | AC_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 | [ |