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

cyassl: Include the CyaSSL build config

Browse Source 
CyaSSL >= 2.6.0 may have an options.h that was generated during
its build by configure.
This commit is contained in:
Jay Satiro 2015-04-11 23:58:42 -04:00
parent 139141f8d7
commit 72bea7cc65
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -2049,6 +2049,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then
dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined! dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
AC_CHECK_SIZEOF(long long) AC_CHECK_SIZEOF(long long)
dnl Versions since at least 2.6.0 may have options.h
AC_CHECK_HEADERS(cyassl/options.h)
dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h dnl Versions since at least 2.9.4 renamed error.h to error-ssl.h
AC_CHECK_HEADERS(cyassl/error-ssl.h) AC_CHECK_HEADERS(cyassl/error-ssl.h)

4
lib/vtls/cyassl.c
View File

@ -45,6 +45,10 @@
#include "rawstr.h" #include "rawstr.h"
#include "curl_printf.h" #include "curl_printf.h"
/* The first CyaSSL include should be its build config aka options.h */
#ifdef HAVE_CYASSL_OPTIONS_H
#include <cyassl/options.h>
#endif
#include <cyassl/ssl.h> #include <cyassl/ssl.h>
#include <cyassl/version.h> #include <cyassl/version.h>
#ifdef HAVE_CYASSL_ERROR_SSL_H #ifdef HAVE_CYASSL_ERROR_SSL_H