diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2015-02-05 20:54:39 +0100 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2015-02-05 20:54:39 +0100 |
| commit | a31e4905fc316dfcb5c88910eb775b477d80460e (patch) | |
| tree | b5eb10dcb4d74189bbc4b43247c9f491cb79fa1e /configure.ac | |
| parent | bb6be1a94fe2b2652d6bd73bf2de9ef0777b8dd1 (diff) | |
| parent | af011b1c9cc0de7904fcea24cf43ef98e2dd7226 (diff) | |
| download | nettle-a31e4905fc316dfcb5c88910eb775b477d80460e.tar.gz | |
Merge branch 'versioned-symbols' into master
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5e7384d7..7892aef7 100644 --- a/configure.ac +++ b/configure.ac @@ -10,10 +10,10 @@ AC_CONFIG_AUX_DIR([.]) AC_CONFIG_HEADER([config.h]) -LIBNETTLE_MAJOR=5 +LIBNETTLE_MAJOR=6 LIBNETTLE_MINOR=0 -LIBHOGWEED_MAJOR=4 +LIBHOGWEED_MAJOR=5 LIBHOGWEED_MINOR=0 AC_CANONICAL_HOST @@ -85,10 +85,13 @@ AC_ARG_ENABLE(mini-gmp, if test "x$enable_mini_gmp" = xyes ; then NETTLE_USE_MINI_GMP=1 + HOGWEED_EXTRA_SYMBOLS="mpz_*;gmp_*;mpn_*;" else NETTLE_USE_MINI_GMP=0 + HOGWEED_EXTRA_SYMBOLS="" fi AC_SUBST([NETTLE_USE_MINI_GMP]) +AC_SUBST([HOGWEED_EXTRA_SYMBOLS]) LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \ `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \ @@ -123,6 +126,8 @@ AC_TRY_COMPILE([],[return 0;],[IF_CXX=''], [IF_CXX='#']) AC_SUBST([IF_CXX]) AC_LANG_POP +LD_VERSION_SCRIPT + AC_PROG_MAKE_SET AC_PROG_RANLIB AC_CHECK_TOOL(NM, nm, strings) @@ -892,7 +897,7 @@ fi AC_CONFIG_FILES([config.make config.m4 Makefile bignum.h]) AC_CONFIG_FILES([tools/Makefile testsuite/Makefile examples/Makefile]) -AC_CONFIG_FILES([nettle.pc hogweed.pc]) +AC_CONFIG_FILES([nettle.pc hogweed.pc libnettle.map libhogweed.map]) AC_OUTPUT |