Index: acinclude.m4 ================================================================== --- acinclude.m4 +++ acinclude.m4 @@ -14,38 +14,38 @@ dnl Disable support for TLS 1.0 protocol AC_ARG_ENABLE([tls1], AS_HELP_STRING([--disable-tls1], [disable TLS1 protocol]), [ if test "${enableval}" = "no"; then AC_DEFINE([NO_TLS1], [1], [Disable TLS1 protocol]) AC_MSG_CHECKING([for disable TLS1 protocol]) - AC_MSG_RESULT('yes') + AC_MSG_RESULT([yes]) fi ]) dnl Disable support for TLS 1.1 protocol AC_ARG_ENABLE([tls1_1], AS_HELP_STRING([--disable-tls1_1], [disable TLS1.1 protocol]), [ if test "${enableval}" = "no"; then AC_DEFINE([NO_TLS1_1], [1], [Disable TLS1.1 protocol]) AC_MSG_CHECKING([for disable TLS1.1 protocol]) - AC_MSG_RESULT('yes') + AC_MSG_RESULT([yes]) fi ]) dnl Disable support for TLS 1.2 protocol AC_ARG_ENABLE([tls1_2], AS_HELP_STRING([--disable-tls1_2], [disable TLS1.2 protocol]), [ if test "${enableval}" = "no"; then AC_DEFINE([NO_TLS1_2], [1], [Disable TLS1.2 protocol]) AC_MSG_CHECKING([for disable TLS1.2 protocol]) - AC_MSG_RESULT('yes') + AC_MSG_RESULT([yes]) fi ]) dnl Disable support for TLS 1.3 protocol AC_ARG_ENABLE([tls1_3], AS_HELP_STRING([--disable-tls1_3], [disable TLS1.3 protocol]), [ if test "${enableval}" = "no"; then AC_DEFINE([NO_TLS1_3], [1], [Disable TLS1.3 protocol]) AC_MSG_CHECKING([for disable TLS1.3 protocol]) - AC_MSG_RESULT('yes') + AC_MSG_RESULT([yes]) fi ]) dnl Determine if we have been asked to use a fast path if possible @@ -108,11 +108,11 @@ [path to include directory of OpenSSL or LibreSSL installation] ), [ opensslincludedir="$withval" ], [ if test ! -z "$openssldir"; then - if test -d "${openssldir}/include/openssl"; then + if test -f "${openssldir}/include/openssl/ssl.h"; then opensslincludedir="${openssldir}/include/openssl" else opensslincludedir="${openssldir}/include" fi else @@ -126,11 +126,15 @@ dnl Set SSL include vars if test ! -z "$opensslincludedir"; then if test -f "$opensslincludedir/ssl.h"; then TCLTLS_SSL_CFLAGS="-I$opensslincludedir" TCLTLS_SSL_INCLUDES="-I$opensslincludedir" + AC_MSG_CHECKING([for ssl.h]) + AC_MSG_RESULT([yes]) else + AC_MSG_CHECKING([for ssl.h]) + AC_MSG_RESULT([no]) AC_MSG_ERROR([Unable to locate ssl.h]) fi else TCLTLS_SSL_CFLAGS="-I${includedir}/openssl" TCLTLS_SSL_INCLUDES="-I${includedir}/openssl"