Fix ENABLE_WITH_OPENSSL set to YES even with --disable-crypto set
PATCH 1/1 Fix ENABLE_WITH_OPENSSL set to YES even with --disable-crypto set
On OS X openssl/x509.h is not in the standard include path and the files still try to include since the includes only depend on on ENABLE_WITH_OPENSSL.
--- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
configure.ac +3 -3
@@ -781,7 +781,7 @@ PKG_CHECK_MODULES( [] ) -if test "${with_crypto_library}" = "openssl"; then +if test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "openssl"; then AC_ARG_VAR([OPENSSL_CFLAGS], [C compiler flags for OpenSSL]) AC_ARG_VAR([OPENSSL_LIBS], [linker flags for OpenSSL])
@@ -835,7 +835,7 @@ if test "${with_crypto_library}" = "openssl"; then AC_DEFINE([ENABLE_CRYPTO_OPENSSL], [1], [Use OpenSSL library]) CRYPTO_CFLAGS="${OPENSSL_CFLAGS}" CRYPTO_LIBS="${OPENSSL_LIBS}" -elif test "${with_crypto_library}" = "mbedtls"; then +elif test "${enable_crypto}" = "yes" -a "${with_crypto_library}" = "mbedtls"; then AC_ARG_VAR([MBEDTLS_CFLAGS], [C compiler flags for mbedtls]) AC_ARG_VAR([MBEDTLS_LIBS], [linker flags for mbedtls])
@@ -918,7 +918,7 @@ elif test "${with_crypto_library}" = "mbedtls"; then AC_DEFINE([ENABLE_CRYPTO_MBEDTLS], [1], [Use mbed TLS library]) CRYPTO_CFLAGS="${MBEDTLS_CFLAGS}" CRYPTO_LIBS="${MBEDTLS_LIBS}" -else +elif test "${enable_crypto}" = "yes"; then AC_MSG_ERROR([Invalid crypto library: ${with_crypto_library}]) fi
Signature · 1 line
2.7.4 (Apple Git-66)
ACK.
Your patch has been applied to the master branch.
Text changed to read "ENABLE_CRYPTO_OPENSSL"
commit d13a40a4a477bae3efede6945174df1cb2c3aa69
Author: Arne Schwabe Date: Sat Sep 17 13:16:46 2016 +0200
Fix ENABLE_CRYPTO_OPENSSL set to YES even with --disable-crypto set
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: http://www.mail-archive.com/search?l=mid&[email protected]...
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering