diff options
| author | corvid <devnull@localhost> | 2016-07-03 21:34:10 +0000 |
|---|---|---|
| committer | corvid <devnull@localhost> | 2016-07-03 21:34:10 +0000 |
| commit | dc0280859b8aea3c571f746471891c42d44050b5 (patch) | |
| tree | 7d202892fc5223a450146ccdf008a733ac5cbc0f | |
| parent | 1290e4a8914471bf1dd28ea6863e86967a81270b (diff) | |
workaround for mbed TLS 2.3.0 include problem
reported by Nick Warne http://lists.dillo.org/pipermail/dillo-dev/2016-July/010941.html
checking mbedtls/ssl.h usability... no
checking mbedtls/ssl.h presence... yes
configure: WARNING: mbedtls/ssl.h: present but cannot be compiled
configure: WARNING: mbedtls/ssl.h: check for missing prerequisite headers?
configure: WARNING: mbedtls/ssl.h: see the Autoconf documentation
configure: WARNING: mbedtls/ssl.h: section "Present But Cannot Be Compiled"
configure: WARNING: mbedtls/ssl.h: proceeding with the compiler's result checking for mbedtls/ssl.h... no
configure: WARNING: *** mbed TLS 2 not found. Disabling SSL/HTTPS/TLS support. ***
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/IO/tls.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 23d4abdd..09b5bf5d 100644 --- a/configure.ac +++ b/configure.ac @@ -294,7 +294,9 @@ dnl Test for support for SSL/TLS dnl -------------------------- dnl if test "x$enable_ssl" = "xyes"; then - AC_CHECK_HEADER(mbedtls/ssl.h, ssl_ok=yes, ssl_ok=no) + AC_CHECK_HEADER(mbedtls/ssl.h, ssl_ok=yes, ssl_ok=no, + [#include <mbedtls/platform.h>]) +dnl In mbed TLS 2.3.0, ssl.h needs platform.h but fails to include it. if test "x$ssl_ok" = "xyes"; then old_libs="$LIBS" diff --git a/src/IO/tls.c b/src/IO/tls.c index 9ee82b90..4ef26789 100644 --- a/src/IO/tls.c +++ b/src/IO/tls.c @@ -42,6 +42,7 @@ void a_Tls_init() #include "tls.h" #include "Url.h" +#include <mbedtls/platform.h> /* WORKAROUND: mbed TLS 2.3.0 ssl.h needs it */ #include <mbedtls/ssl.h> #include <mbedtls/ctr_drbg.h> /* random number generator */ #include <mbedtls/entropy.h> |