aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--lib/vtls/cyassl.c4
2 files changed, 7 insertions, 0 deletions
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