diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-12-02 08:40:14 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-12-02 08:40:14 +0000 |
| commit | ffc6cf65f8d06742d455c558fed7ccb49b351207 (patch) | |
| tree | d8e78a31f5cb661d0d34f0e6d76e382aecbdf15b | |
| parent | 4353ea025ae032887f3e8cf5aadace25662c6b35 (diff) | |
| parent | f7791712665a6b5f2b8ac0840c701b9abc95e92e (diff) | |
| download | gnutls-ffc6cf65f8d06742d455c558fed7ccb49b351207.tar.gz | |
Merge branch 'tmp-ametzler-nettle-not-found-error' into 'master'
Fix error message on too old nettle
See merge request gnutls/gnutls!833
| -rw-r--r-- | m4/hooks.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/m4/hooks.m4 b/m4/hooks.m4 index aebc58214a..86b4b2a0e5 100644 --- a/m4/hooks.m4 +++ b/m4/hooks.m4 @@ -68,16 +68,17 @@ AC_DEFUN([LIBGNUTLS_HOOKS], DLL_SSL_VERSION=`expr ${LT_SSL_CURRENT} - ${LT_SSL_AGE}` AC_SUBST(DLL_SSL_VERSION) - PKG_CHECK_MODULES(NETTLE, [nettle >= 3.4.1], [cryptolib="nettle"], [ +NETTLE_MINIMUM=3.4.1 + PKG_CHECK_MODULES(NETTLE, [nettle >= $NETTLE_MINIMUM], [cryptolib="nettle"], [ AC_MSG_ERROR([[ *** - *** Libnettle 3.4 was not found. + *** Libnettle $NETTLE_MINIMUM was not found. ]]) ]) - PKG_CHECK_MODULES(HOGWEED, [hogweed >= 3.4.1], [], [ + PKG_CHECK_MODULES(HOGWEED, [hogweed >= $NETTLE_MINIMUM ], [], [ AC_MSG_ERROR([[ *** - *** Libhogweed (nettle's companion library) was not found. Note that you must compile nettle with gmp support. + *** Libhogweed (nettle's companion library) $NETTLE_MINIMUM was not found. Note that you must compile nettle with gmp support. ]]) ]) AM_CONDITIONAL(ENABLE_NETTLE, test "$cryptolib" = "nettle") |