Skip to content

Commit a1b45bb

Browse files
authored
Autotools: Sync PHP_SETUP_* M4 macros (#15117)
- arguments quoted - MYSQLND_HAVE_SSL help text synced
1 parent c53b272 commit a1b45bb

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

ext/ftp/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ if test "$PHP_FTP" = "yes"; then
2020
test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
2121

2222
if test "$PHP_OPENSSL" != "no" || test "$PHP_FTP_SSL" != "no"; then
23-
PHP_SETUP_OPENSSL(FTP_SHARED_LIBADD)
23+
PHP_SETUP_OPENSSL([FTP_SHARED_LIBADD])
2424
PHP_SUBST([FTP_SHARED_LIBADD])
2525
AC_DEFINE(HAVE_FTP_SSL,1,[Whether FTP over SSL is supported])
2626
fi

ext/intl/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PHP_ARG_ENABLE([intl],
44
[Enable internationalization support])])
55

66
if test "$PHP_INTL" != "no"; then
7-
PHP_SETUP_ICU(INTL_SHARED_LIBADD)
7+
PHP_SETUP_ICU([INTL_SHARED_LIBADD])
88
PHP_SUBST([INTL_SHARED_LIBADD])
99
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"
1010
PHP_NEW_EXTENSION(intl, php_intl.c \

ext/mysqlnd/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if (PHP_MYSQLND != "no") {
3737
AC_DEFINE("MYSQLND_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
3838
AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
3939
if (CHECK_LIB("crypt32.lib", "mysqlnd")) {
40-
AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Extended SSL support");
40+
AC_DEFINE("MYSQLND_HAVE_SSL", 1, "Define to 1 if mysqlnd has extended SSL support through OpenSSL.");
4141
}
4242
}
4343
PHP_INSTALL_HEADERS("", "ext/mysqlnd");

ext/mysqlnd/config9.m4

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
3535
test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
3636

3737
if test "$PHP_OPENSSL" != "no" || test "$PHP_MYSQLND_SSL" != "no"; then
38-
PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
38+
PHP_SETUP_OPENSSL([MYSQLND_SHARED_LIBADD],
39+
[AC_DEFINE([MYSQLND_HAVE_SSL], [1],
40+
[Define to 1 if mysqlnd has extended SSL support through OpenSSL.])])
3941
fi
4042

4143
PHP_NEW_EXTENSION([mysqlnd], m4_normalize([

0 commit comments

Comments
 (0)