Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix bug #79112: IMAP can't find OpenSSL during configure

Author: nikic

build/php.m4

@@ -1920,13 +1920,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)

ext/ftp/config.m4

@@ -3,10 +3,11 @@ PHP_ARG_ENABLE([ftp],
   [AS_HELP_STRING([--enable-ftp],
     [Enable FTP support])])
 
+dnl TODO: Rename this option for master.
 PHP_ARG_WITH([openssl-dir],
-  [OpenSSL dir for FTP],
-  [AS_HELP_STRING([[--with-openssl-dir[=DIR]]],
-    [FTP: openssl install prefix])],
+  [whether to explicitly enable FTP SSL support],
+  [AS_HELP_STRING([[--with-openssl-dir]],
+    [FTP: Whether to enable FTP SSL support without ext/openssl])],
   [no],
   [no])
 

ext/imap/config.m4

@@ -73,7 +73,7 @@ AC_DEFUN([PHP_IMAP_SSL_CHK], [
     ], [
       AC_MSG_ERROR([OpenSSL libraries not found.
 
-      Check the path given to --with-openssl-dir and output in config.log)
+      Check whether openssl is on your PKG_CONFIG_PATH and the output in config.log)
       ])
     ])
   elif test -f "$IMAP_INC_DIR/linkage.c"; then
@@ -100,8 +100,8 @@ PHP_ARG_WITH([kerberos],
 
 PHP_ARG_WITH([imap-ssl],
   [for IMAP SSL support],
-  [AS_HELP_STRING([[--with-imap-ssl[=DIR]]],
-    [IMAP: Include SSL support. DIR is the OpenSSL install prefix])],
+  [AS_HELP_STRING([[--with-imap-ssl]],
+    [IMAP: Include SSL support])],
   [no],
   [no])
 

ext/snmp/config.m4

@@ -3,13 +3,6 @@ PHP_ARG_WITH([snmp],
   [AS_HELP_STRING([[--with-snmp[=DIR]]],
     [Include SNMP support])])
 
-PHP_ARG_WITH([openssl-dir],
-  [OpenSSL dir for SNMP],
-  [AS_HELP_STRING([[--with-openssl-dir[=DIR]]],
-    [SNMP: openssl install prefix])],
-  [no],
-  [no])
-
 if test "$PHP_SNMP" != "no"; then
 
   if test "$PHP_SNMP" = "yes"; then