From 18535eaa6c3bfd8bb5f5612baee01ddfb5645625 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 4 Dec 2016 03:45:54 +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. --- m4/ssl.m4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/m4/ssl.m4 b/m4/ssl.m4 index a7321e391e..cdddda0def 100644 --- a/m4/ssl.m4 +++ b/m4/ssl.m4 @@ -38,8 +38,6 @@ AC_DEFUN([DOVECOT_SSL], [ #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 @@ -82,6 +80,7 @@ AC_DEFUN([DOVECOT_SSL], [ fi AM_CONDITIONAL(BUILD_OPENSSL, test "$have_openssl" = "yes") AM_CONDITIONAL(BUILD_DCRYPT_OPENSSL, test "$build_dcrypt_openssl" = "yes") + AM_CONDITIONAL([SSL_VERSION_GE_102], [test x$ssl_version_ge_102 = xtrue]) if test $want_gnutls != no && test $have_ssl = no; then AC_CHECK_LIB(gnutls, gnutls_global_init, [ -- 2.47.3