Fix to disable CRL monitor for single threaded or lighttpd. Do not set --enable-lighty with --enable-all.

This commit is contained in:
David Garske
2020-07-31 09:20:39 -07:00
committed by Daniel Pouzzner
parent daca327ba3
commit a9a495270c

View File

@@ -334,7 +334,6 @@ then
enable_srp=yes enable_srp=yes
enable_certservice=yes enable_certservice=yes
enable_jni=yes enable_jni=yes
enable_lighty=yes
enable_haproxy=yes enable_haproxy=yes
enable_stunnel=yes enable_stunnel=yes
enable_nginx=yes enable_nginx=yes
@@ -3209,7 +3208,13 @@ if test "$ENABLED_CRL_MONITOR" = "yes"
then then
case $host_os in case $host_os in
*linux* | *darwin* | *freebsd*) *linux* | *darwin* | *freebsd*)
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_MONITOR" ;; if test "x$ENABLED_SINGLETHREADED" = "xno"; then
AM_CFLAGS="$AM_CFLAGS -DHAVE_CRL_MONITOR"
else
ENABLED_CRL_MONITOR="no"
AC_MSG_ERROR([crl monitor requires threading / pthread])
fi
;;
*) *)
if test "x$ENABLED_DISTRO" = "xyes" ; then if test "x$ENABLED_DISTRO" = "xyes" ; then
ENABLED_CRL_MONITOR="no" ENABLED_CRL_MONITOR="no"
@@ -3912,12 +3917,16 @@ then
# recommended # recommended
AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_COMP" AM_CFLAGS="$AM_CFLAGS -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_COMP"
AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS" AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS"
if test "x$ENABLED_ALL" = "xno"; then
AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED" AM_CFLAGS="$AM_CFLAGS -DSINGLE_THREADED"
ENABLED_SINGLETHREADED="yes" ENABLED_SINGLETHREADED="yes"
# w/ lighttpd 1.4.56 once WolfSSL is updated to expose non-filesystem funcs
# w/lighttpd 1.4.56 once wolfSSL is updated to expose non-filesystem funcs
#AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM" #AM_CFLAGS="$AM_CFLAGS -DNO_FILESYSTEM"
#ENABLED_FILESYSTEM=no #ENABLED_FILESYSTEM=no
fi fi
fi
if test "$ENABLED_NGINX" = "yes" if test "$ENABLED_NGINX" = "yes"
then then