diff options
| author | Jakub Zelenka <bukka@php.net> | 2017-04-07 19:20:11 +0100 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2017-04-07 19:21:33 +0100 |
| commit | cdc33251d204fd093b45a06ac569ddfb95b7dec2 (patch) | |
| tree | b04cb0a919cb259ff7682b933aa671c675802c0f /acinclude.m4 | |
| parent | 27120d4412a7122f27ac1fcd4d91090ce7979647 (diff) | |
| download | php-git-cdc33251d204fd093b45a06ac569ddfb95b7dec2.tar.gz | |
Add OpenSSL 1.1.0 support to PHP 7.0
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 6 |
1 files changed, 2 insertions, 4 deletions
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 |