diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-01-22 23:04:10 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-01-22 23:04:10 +0100 |
| commit | e888e30476c9bbb0f6fd0a79737197156dc0a99c (patch) | |
| tree | 314679ff070b321ad4f86569f8e893049dd83c10 | |
| parent | 3d5648f9ee08cdbd6297978c8e67d02b90ba0151 (diff) | |
BoringSSL: fix build for non-configure builds
HAVE_BORINGSSL gets defined now by configure and should be defined by
other build systems in case a BoringSSL build is desired.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/curl_setup.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 61968b942..7193e2790 100644 --- a/configure.ac +++ b/configure.ac @@ -1617,6 +1617,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then AC_MSG_CHECKING([for BoringSSL]) if test "x$ac_cv_func_DES_set_odd_parity" != "xyes"; then curl_ssl_msg="enabled (BoringSSL)" + AC_DEFINE_UNQUOTED(HAVE_BORINGSSL, 1, + [Define to 1 if using BoringSSL.]) AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 103938cc1..93ffad034 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -626,8 +626,8 @@ int netware_init(void); defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \ defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) -#if defined(USE_SSLEAY) && !defined(HAVE_DES_SET_ODD_PARITY) -/* BoringSSL, not NTLM capable */ +#ifdef HAVE_BORINGSSL /* BoringSSL is not NTLM capable */ +#undef USE_NTLM #else #define USE_NTLM #endif |