diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-17 11:22:32 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-20 09:59:27 +0100 |
| commit | 74380465ec8d868bd3d28d7cf73151642d195012 (patch) | |
| tree | e692632a71e7d10028a6b81ef09a1367248544ce /build | |
| parent | b6506ab32a902029303a5d3a3afaa299c41fbe1a (diff) | |
| download | php-git-74380465ec8d868bd3d28d7cf73151642d195012.tar.gz | |
Fix bug #79112: IMAP can't find OpenSSL during configure
Remove the check of PHP_OPENSSL inside SETUP_OPENSSL. It's the
responsibility of the caller to determine whether they want to
enable openssl or not. This makes SSL detection in IMAP work,
which uses a different option.
Additionally also clarify that --with-openssl-dir cannot actually
be used to specify an OpenSSL directory -- these options just
serve as a way to enable OpenSSL in extensions without also
enabling the OpenSSL extension. They need to be renamed to
something clearer in master.
Closes GH-5091.
Diffstat (limited to 'build')
| -rw-r--r-- | build/php.m4 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/build/php.m4 b/build/php.m4 index e91ef9887c..7392876478 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -1917,13 +1917,7 @@ dnl AC_DEFUN([PHP_SETUP_OPENSSL],[ found_openssl=no - dnl Empty variable means 'no'. - test -z "$PHP_OPENSSL" && PHP_OPENSSL=no - test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - - if test "$PHP_OPENSSL" != "no"; then - PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1], [found_openssl=yes]) - fi + PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.0.1], [found_openssl=yes]) if test "$found_openssl" = "yes"; then PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1) |