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.

diff --git a/configure.ac b/configure.ac
index 61968b942dc596a7af0423bd8247a8b2bba6cb5e..7193e279070b03f780b68ca23ab5d3670e8020cb 100644 (file)
--- 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 103938cc150bba78cf55952c6f5dd29d7197906d..93ffad034d4a60688e4426e92ba35e32a29e31f2 100644 (file)
--- 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