From 2335e2b040df17dd1bcd71aa207dda23b9226278 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Tue, 11 Aug 2015 07:32:35 +0000 Subject: [PATCH] - Fix #694: configure script does not detect LibreSSL 2.2.2 git-svn-id: file:///svn/unbound/trunk@3470 be551aaa-1e26-0410-a405-d3ace91eadb9 --- configure | 2 +- configure.ac | 2 +- doc/Changelog | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 03c142257..e26da24fb 100755 --- a/configure +++ b/configure @@ -16684,7 +16684,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LibreSSL" >&5 $as_echo_n "checking for LibreSSL... " >&6; } -if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then +if grep -e OPENSSL_VERSION_TEXT -e LIBRESSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/configure.ac b/configure.ac index 1b27692f6..ca26fb2b7 100644 --- a/configure.ac +++ b/configure.ac @@ -566,7 +566,7 @@ if test $USE_NSS = "no"; then ACX_WITH_SSL ACX_LIB_SSL AC_MSG_CHECKING([for LibreSSL]) -if grep OPENSSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then +if grep -e OPENSSL_VERSION_TEXT -e LIBRESSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_LIBRESSL], [1], [Define if we have LibreSSL]) # libressl provides these compat functions, but they may also be diff --git a/doc/Changelog b/doc/Changelog index e5f1d8a40..4f813092b 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,6 @@ +11 August 2015: Wouter + - Fix #694: configure script does not detect LibreSSL 2.2.2 + 4 August 2015: Wouter - Document that local-zone nodefault matches exactly and transparent can be used to release a subzone. -- 2.47.2