From f7f4b657ceb3572b89268ee660aeb77df95674ef Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 4 Dec 2016 03:44:43 +0200 Subject: [PATCH] configure: Fix building without OpenSSL AM_CONDITIONAL() needs to be part of the code path that is always run, or it fails with: configure: error: conditional "SSL_VERSION_GE_102" was never defined. --- configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9a6f27b3ee..88549d598c 100644 --- a/configure.ac +++ b/configure.ac @@ -1715,8 +1715,6 @@ if test $want_openssl != no && test $have_ssl = no; then #endif]], [[ return 0; ]])], [ssl_version_ge_102=true], [ssl_version_ge_102=false]) AC_MSG_RESULT([$ssl_version_ge_102]) - AM_CONDITIONAL([SSL_VERSION_GE_102], [test x$ssl_version_ge_102 = xtrue]) - # SSL_clear_options introduced in openssl 0.9.8m but may be backported to # older versions in "enterprise" OS releases; originally implemented as a # macro but as a function in more recent openssl versions @@ -1758,6 +1756,7 @@ if test $want_openssl != no && test $have_ssl = no; then fi fi fi +AM_CONDITIONAL([SSL_VERSION_GE_102], [test x$ssl_version_ge_102 = xtrue]) AM_CONDITIONAL(BUILD_OPENSSL, test "$have_openssl" = "yes") AM_CONDITIONAL(BUILD_DCRYPT_OPENSSL, test "$build_dcrypt_openssl" = "yes")