diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-04 13:16:11 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-04 13:16:11 +0000 |
| commit | 71afdf09b820180f3125eeefaeb787155e7333fc (patch) | |
| tree | ada294c9b7ff87aad6522f1ec2cea8b7ea4fe9bd | |
| parent | 57b000a781b8aec8a979f31c134d50fdffb0b768 (diff) | |
| parent | ad3af2a1ab9428a443af5600c22d0530b275514a (diff) | |
| download | gnutls-71afdf09b820180f3125eeefaeb787155e7333fc.tar.gz | |
Merge branch 'fix-nettle-check' into 'master'
build: pass NETTLE_LIBS together with HOGWEED_LIBS
See merge request gnutls/gnutls!903
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 7568363ef3..b740bad029 100644 --- a/configure.ac +++ b/configure.ac @@ -537,7 +537,7 @@ AC_ARG_ENABLE(non-suiteb-curves, if test "$enable_non_suiteb" = "yes";then dnl nettle_secp_192r1 is not really a function - AC_CHECK_LIB(hogweed, nettle_secp_192r1, enable_non_suiteb=yes, enable_non_suiteb=no, [$HOGWEED_LIBS]) + AC_CHECK_LIB(hogweed, nettle_secp_192r1, enable_non_suiteb=yes, enable_non_suiteb=no, [$HOGWEED_LIBS $NETTLE_LIBS]) if test "$enable_non_suiteb" = "yes";then AC_DEFINE([ENABLE_NON_SUITEB_CURVES], 1, [Enable all curves]) @@ -547,7 +547,7 @@ AM_CONDITIONAL(ENABLE_NON_SUITEB_CURVES, test "$enable_non_suiteb" = "yes") # We MUST require a Nettle version that has rsa_sec_decrypt now. save_LIBS=$LIBS -LIBS="$LIBS $HOGWEED_LIBS" +LIBS="$LIBS $HOGWEED_LIBS $NETTLE_LIBS" AC_CHECK_FUNCS(nettle_rsa_sec_decrypt, [], [AC_MSG_ERROR([Nettle lacks the required rsa_sec_decrypt function])] |