From 72bea7cc651491fefc8e1a3bb0c7238dc90f149c Mon Sep 17 00:00:00 2001
From: Jay Satiro <raysatiro@yahoo.com>
Date: Sat, 11 Apr 2015 23:58:42 -0400
Subject: cyassl: Include the CyaSSL build config

CyaSSL >= 2.6.0 may have an options.h that was generated during
its build by configure.
---
 configure.ac      | 3 +++
 lib/vtls/cyassl.c | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/configure.ac b/configure.ac
index 098629801..5673257b8 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 5e79389ea..9ea7a88f6 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
-- 
cgit v1.2.3