From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 14 Aug 2015 09:08:44 +0000 (+0000)
Subject: fixup libressl detection on solaris.
X-Git-Tag: release-1.5.5rc1~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=954b212895f421db4ae99a8d86efc118f14557e0;p=thirdparty%2Funbound.git

fixup libressl detection on solaris.


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

diff --git a/configure b/configure
index e26da24fb..e2b1bdec4 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 -e OPENSSL_VERSION_TEXT -e LIBRESSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then
+if grep 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 ca26fb2b7..5ad39c7d5 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 -e OPENSSL_VERSION_TEXT -e LIBRESSL_VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then
+if grep 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