From 7cee131e3753a2cba39882fe54aa1cc693b59dd7 Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Fri, 31 Jul 2020 15:20:22 -0400 Subject: [PATCH] restore `--enable-lighty` with `--enable-all` protect lighttpd recommendations (and recommended restrictions) to when building wolfSSL specifically for use by lighttpd, and omit these optional settings when building `--enable-all` --- configure.ac | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 0f97a3614..1ee210a7c 100644 --- a/configure.ac +++ b/configure.ac @@ -334,6 +334,7 @@ then enable_srp=yes enable_certservice=yes enable_jni=yes + enable_lighty=yes enable_haproxy=yes enable_stunnel=yes enable_nginx=yes @@ -3914,15 +3915,17 @@ then AM_CFLAGS="$AM_CFLAGS -DHAVE_LIGHTY -DHAVE_WOLFSSL_SSL_H=1" AM_CFLAGS="$AM_CFLAGS -DHAVE_EX_DATA" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_ALL" - # recommended - AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_COMP" - AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS" - + # recommended if building wolfSSL specifically for use by lighttpd if test "x$ENABLED_ALL" = "xno"; then - AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED" - ENABLED_SINGLETHREADED="yes" + AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_COMP" + AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS" + ENABLED_OLD_TLS=no + if test "x$ENABLED_CRL_MONITOR" = "xno"; then + AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED" + ENABLED_SINGLETHREADED="yes" + fi - # w/lighttpd 1.4.56 once wolfSSL is updated to expose non-filesystem funcs + # w/ lighttpd 1.4.56 once wolfSSL updated to expose non-filesystem funcs #AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM" #ENABLED_FILESYSTEM=no fi