diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-10-05 08:44:05 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-10-05 08:55:01 +0200 |
| commit | a12677542c84457b4e077acad80d699b39d8ec5e (patch) | |
| tree | d18f131ed265ee6b9c90a57e820d4c06e84262fe | |
| parent | 215cd529ff41e2e04f3f095314d8ed199da1c83a (diff) | |
| download | gnutls-a12677542c84457b4e077acad80d699b39d8ec5e.tar.gz | |
Fixed the version in libgnutls-openssl.def file
Previously the version set in that file would have
been (incorrectly) equal to the version of the main library.
| -rw-r--r-- | extra/Makefile.am | 6 | ||||
| -rw-r--r-- | m4/hooks.m4 | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index f9716e62c7..601bbae5aa 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -68,9 +68,9 @@ libgnutls_openssl_la_LIBADD += $(LIBSOCKET) if HAVE_LD_OUTPUT_DEF libgnutls_openssl_la_LDFLAGS += \ - -Wl,--output-def,libgnutls-openssl-$(DLL_VERSION).def -libgnutls-openssl-$(DLL_VERSION).def: libgnutls-openssl.la -defexec_DATA += libgnutls-openssl-$(DLL_VERSION).def + -Wl,--output-def,libgnutls-openssl-$(DLL_SSL_VERSION).def +libgnutls-openssl-$(DLL_SSL_VERSION).def: libgnutls-openssl.la +defexec_DATA += libgnutls-openssl-$(DLL_SSL_VERSION).def endif endif diff --git a/m4/hooks.m4 b/m4/hooks.m4 index 925e43d1fd..1eba984402 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -64,6 +64,8 @@ AC_DEFUN([LIBGNUTLS_HOOKS], # Used when creating the Windows libgnutls-XX.def files. DLL_VERSION=`expr ${LT_CURRENT} - ${LT_AGE}` AC_SUBST(DLL_VERSION) + DLL_SSL_VERSION=`expr ${LT_SSL_CURRENT} - ${LT_SSL_AGE}` + AC_SUBST(DLL_SSL_VERSION) PKG_CHECK_MODULES(NETTLE, [nettle >= 3.1], [cryptolib="nettle"], [ AC_MSG_ERROR([[ |