From: Jay Satiro <raysatiro@yahoo.com>
Date: Sun, 12 Apr 2015 03:58:42 +0000 (-0400)
Subject: cyassl: Include the CyaSSL build config
X-Git-Tag: curl-7_42_0~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72bea7cc651491fefc8e1a3bb0c7238dc90f149c;p=thirdparty%2Fcurl.git

cyassl: Include the CyaSSL build config

CyaSSL >= 2.6.0 may have an options.h that was generated during
its build by configure.
---

diff --git a/configure.ac b/configure.ac
index 098629801b..5673257b81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2049,6 +2049,9 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then
       dnl cyassl/ctaocrypt/types.h needs SIZEOF_LONG_LONG defined!
       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
       AC_CHECK_HEADERS(cyassl/error-ssl.h)
 
diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c
index 5e79389ea8..9ea7a88f6a 100644
--- a/lib/vtls/cyassl.c
+++ b/lib/vtls/cyassl.c
@@ -45,6 +45,10 @@
 #include "rawstr.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/version.h>
 #ifdef HAVE_CYASSL_ERROR_SSL_H