From cdc33251d204fd093b45a06ac569ddfb95b7dec2 Mon Sep 17 00:00:00 2001 From: Jakub Zelenka Date: Fri, 7 Apr 2017 19:20:11 +0100 Subject: Add OpenSSL 1.1.0 support to PHP 7.0 --- acinclude.m4 | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'acinclude.m4') diff --git a/acinclude.m4 b/acinclude.m4 index 25c3c7d66b..36bd1c22e5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2337,15 +2337,13 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[ dnl If pkg-config is found try using it if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then - if $PKG_CONFIG --atleast-version=1.1 openssl; then - AC_MSG_ERROR([OpenSSL version >= 1.1 is not supported.]) - elif $PKG_CONFIG --atleast-version=0.9.8 openssl; then + if $PKG_CONFIG --atleast-version=0.9.8 openssl; then found_openssl=yes OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` else - AC_MSG_ERROR([OpenSSL version >= 0.9.8 and < 1.1 required.]) + AC_MSG_ERROR([OpenSSL version 0.9.8 or greater required.]) fi if test -n "$OPENSSL_LIBS"; then -- cgit v1.2.1