com php-src: report about OpenSSL 1.1 not supported during configure: acinclude.m4
[email protected] (Remi Collet)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 015a80ef7bb5d691745b6fba35060d996c788a53 Author: Remi Collet <[email protected]> Tue, 21 Feb 2017 16:27:51 +0100 Committer: Remi Collet <[email protected]> Wed, 22 Feb 2017 08:39:07 +0100 Parents: 9eaf551c86593697805b4f8f75a2d5b83b45fc1e Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=015a80ef7bb5d691745b6fba35060d996c788a53 Log: report about OpenSSL 1.1 not supported during configure Changed paths: M acinclude.m4 Diff: diff --git a/acinclude.m4 b/acinclude.m4 index 36bd1c2..25c3c7d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2337,13 +2337,15 @@ 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=0.9.8 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 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 or greater required.]) + AC_MSG_ERROR([OpenSSL version >= 0.9.8 and < 1.1 required.]) fi if test -n "$OPENSSL_LIBS"; then