diff mbox

[1/2] dovecot: bump version to 2.2.27 (security)

Message ID 20161210152349.3bec5dd4@free-electrons.com
State Not Applicable
Headers show

Commit Message

Thomas Petazzoni Dec. 10, 2016, 2:23 p.m. UTC 
Hello,

On Sat, 10 Dec 2016 15:23:02 +0100, Thomas Petazzoni wrote:

> Basically, dovecot no longer builds without OpenSSL support. The
> configure error can be fixed by adding the attached patch (+ a
> host-gettext dependency + autoreconf + creating m4). But then, the
> build fails with:

Now with the patch attached.

Thomas
diff mbox

Patch

From 361ad1ced5fa35fb25ee7faf8b287eb4ff36d9bc Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sat, 10 Dec 2016 15:05:45 +0100
Subject: [PATCH] configure.ac: AM_CONDITIONAL() should not be inside a
 condition

AM_CONDITIONAL() should be defined outside any condition, otherwise the
build fails with:

checking that generated files are newer than configure... done
configure: error: conditional "SSL_VERSION_GE_102" was never defined.

when building without OpenSSL support.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 83e7646..8a89176 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
@@ -1761,6 +1759,7 @@  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.7.4