From 3531d3484b6f7842ae865fae4436f0583cacc4fc Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 27 Jul 2024 02:25:31 +0200
Subject: [PATCH] Autotools: Sync PHP_SETUP_* M4 macros

- arguments quoted
- MYSQLND_HAVE_SSL help text synced
---
 ext/ftp/config.m4      | 2 +-
 ext/intl/config.m4     | 2 +-
 ext/mysqlnd/config.w32 | 2 +-
 ext/mysqlnd/config9.m4 | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ext/ftp/config.m4 b/ext/ftp/config.m4
index 1ad42a0510ba3..383888b415b08 100644
--- a/ext/ftp/config.m4
+++ b/ext/ftp/config.m4
@@ -20,7 +20,7 @@ if test "$PHP_FTP" = "yes"; then
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
 
   if test "$PHP_OPENSSL" != "no" || test "$PHP_FTP_SSL" != "no"; then
-    PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
+    PHP_SETUP_OPENSSL([FTP_SHARED_LIBADD])
     PHP_SUBST([FTP_SHARED_LIBADD])
     AC_DEFINE(HAVE_FTP_SSL,1,[Whether FTP over SSL is supported])
   fi
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
index 793ad6c861174..12d0e224db9d3 100644
--- a/ext/intl/config.m4
+++ b/ext/intl/config.m4
@@ -4,7 +4,7 @@ PHP_ARG_ENABLE([intl],
     [Enable internationalization support])])
 
 if test "$PHP_INTL" != "no"; then
-  PHP_SETUP_ICU(INTL_SHARED_LIBADD)
+  PHP_SETUP_ICU([INTL_SHARED_LIBADD])
   PHP_SUBST([INTL_SHARED_LIBADD])
   INTL_COMMON_FLAGS="$ICU_CFLAGS -Wno-write-strings -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
   PHP_NEW_EXTENSION(intl, php_intl.c \
diff --git a/ext/mysqlnd/config.w32 b/ext/mysqlnd/config.w32
index f5efa999df150..d87f67c6e24ac 100644
--- a/ext/mysqlnd/config.w32
+++ b/ext/mysqlnd/config.w32
@@ -37,7 +37,7 @@ if (PHP_MYSQLND != "no") {
 			AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
 			AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
 			if (CHECK_LIB("crypt32.lib", "mysqlnd")) {
-				AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Extended SSL support");
+				AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd has extended SSL support through OpenSSL.");
 			}
 		}
 		PHP_INSTALL_HEADERS("", "ext/mysqlnd");
diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4
index abcbd2afbb1be..24b5d7aa878e1 100644
--- a/ext/mysqlnd/config9.m4
+++ b/ext/mysqlnd/config9.m4
@@ -35,7 +35,9 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
 
   if test "$PHP_OPENSSL" != "no" || test "$PHP_MYSQLND_SSL" != "no"; then
-    PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
+    PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD],
+      [AC_DEFINE([MYSQLND_HAVE_SSL], [1],
+        [Define to 1 if mysqlnd has extended SSL support through OpenSSL.])])
   fi
 
   PHP_NEW_EXTENSION([mysqlnd], m4_normalize([