generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BoringSSL: fix build for non-configure builds

Browse Source 
HAVE_BORINGSSL gets defined now by configure and should be defined by
other build systems in case a BoringSSL build is desired.
This commit is contained in:
Daniel Stenberg 2015-01-22 23:04:10 +01:00
parent 3d5648f9ee
commit e888e30476
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1617,6 +1617,8 @@ if test "$curl_ssl_msg" = "$init_ssl_msg" && test X"$OPT_SSL" != Xno; then
AC_MSG_CHECKING([for BoringSSL]) AC_MSG_CHECKING([for BoringSSL])
if test "x$ac_cv_func_DES_set_odd_parity" != "xyes"; then if test "x$ac_cv_func_DES_set_odd_parity" != "xyes"; then
curl_ssl_msg="enabled (BoringSSL)" curl_ssl_msg="enabled (BoringSSL)"
AC_DEFINE_UNQUOTED(HAVE_BORINGSSL, 1,
[Define to 1 if using BoringSSL.])
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

4
lib/curl_setup.h
View File

@ -626,8 +626,8 @@ int netware_init(void);
defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \ defined(USE_GNUTLS) || defined(USE_NSS) || defined(USE_DARWINSSL) || \
defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO) defined(USE_OS400CRYPTO) || defined(USE_WIN32_CRYPTO)
#if defined(USE_SSLEAY) && !defined(HAVE_DES_SET_ODD_PARITY) #ifdef HAVE_BORINGSSL /* BoringSSL is not NTLM capable */
/* BoringSSL, not NTLM capable */ #undef USE_NTLM
#else #else
#define USE_NTLM #define USE_NTLM
#endif #endif