- Fix #694: configure script does not detect LibreSSL 2.2.2

git-svn-id: file:///svn/unbound/trunk@3470 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 03c142257cb864ec97eb8d3436cad73e705ba86f..e26da24fb0298ff5894f3661105d208cbe81bb8c 100755 (executable)
--- 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 1b27692f68e04ce7ebedd96fa4d1b22ce39e329b..ca26fb2b7ab5e2d9e992df6bc743f1725db0d0cd 100644 (file)
--- 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 e5f1d8a4086e3767ecca84cdf98a5b972a4c22d0..4f813092b049f7a59118ef691f0419139483437c 100644 (file)
--- 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.