diff options
author | Sergey 'Jin' Bostandzhyan <jin at mediatomb dot cc> | 2017-01-11 22:41:11 +0100 |
---|---|---|
committer | Sergey 'Jin' Bostandzhyan <jin at mediatomb dot cc> | 2017-01-18 11:20:07 +0100 |
commit | 3f24f048762736e1a5d785a080fec7e84172e708 (patch) | |
tree | 3a0a66087a0d0d97bc19c6f4ee379f923f4ab9e8 /configure.ac | |
parent | 5ad3c9890574cfe91a856e4836a553973b7da1a9 (diff) |
Setup autotools to read .so version info from a separate file
We want to use the same libtool style .so versions in both build systems,
ideally both systems should read the version information from the same
configuration file.
This commit introduces an so.version configuration file and sets up
the autotools to use it.
The version numbers in so.version define the ABI compatibility and should be
updated prior to each release.
implements #323
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 23 |
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]) | |||
12 | 12 | ||
13 | EXTRA_LT_LDFLAGS= | 13 | EXTRA_LT_LDFLAGS= |
14 | 14 | ||
15 | LIBTOXCORE_LT_VERSION=0:0:0 | ||
16 | dnl | ||
17 | dnl current:revision:age | ||
18 | dnl | ||
19 | dnl current: increment if interfaces have been added, removed or changed | ||
20 | dnl revision: increment if source code has changed, set to zero if current is | ||
21 | dnl incremented | ||
22 | dnl age: increment if interfaces have been added, set to zero if | ||
23 | dnl interfaces have been removed or changed | ||
24 | |||
25 | if test "x${prefix}" = "xNONE"; then | 15 | if test "x${prefix}" = "xNONE"; then |
26 | prefix="${ac_default_prefix}" | 16 | prefix="${ac_default_prefix}" |
27 | fi | 17 | fi |
@@ -40,22 +30,19 @@ LIBCONFIG_FOUND="no" | |||
40 | LIBCHECK_FOUND="no" | 30 | LIBCHECK_FOUND="no" |
41 | WANT_NACL="no" | 31 | WANT_NACL="no" |
42 | ADD_NACL_OBJECTS_TO_PKGCONFIG="yes" | 32 | ADD_NACL_OBJECTS_TO_PKGCONFIG="yes" |
43 | 33 | SET_SO_VERSION="yes" | |
44 | TOXCORE_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" | ||
45 | TOXAV_LT_LDFLAGS="-version-info $LIBTOXCORE_LT_VERSION" | ||
46 | 34 | ||
47 | AC_ARG_ENABLE([soname-versions], | 35 | AC_ARG_ENABLE([soname-versions], |
48 | [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ], | 36 | [AC_HELP_STRING([--enable-soname-versions], [enable soname versions (must be disabled for android) (default: enabled)]) ], |
49 | [ | 37 | [ |
50 | if test "x$enableval" = "xno"; then | 38 | if test "x$enableval" = "xno"; then |
51 | TOXCORE_LT_LDFLAGS="-avoid-version" | 39 | SET_SO_VERSION="no" |
52 | TOXAV_LT_LDFLAGS="-avoid-version" | 40 | elif test "x$enableval" = "xyes"; then |
41 | SET_SO_VERSION="yes" | ||
53 | fi | 42 | fi |
54 | ] | 43 | ] |
55 | ) | 44 | ) |
56 | 45 | AM_CONDITIONAL(SET_SO_VERSION, test "x$SET_SO_VERSION" = "xyes") | |
57 | AC_SUBST(TOXCORE_LT_LDFLAGS) | ||
58 | AC_SUBST(TOXAV_LT_LDFLAGS) | ||
59 | 46 | ||
60 | AC_ARG_ENABLE([nacl], | 47 | AC_ARG_ENABLE([nacl], |
61 | [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ], | 48 | [AC_HELP_STRING([--enable-nacl], [use nacl instead of libsodium (default: disabled)]) ], |