archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Sync PHP_SETUP_* M4 macros (#15117)

Browse source 
- arguments quoted
- MYSQLND_HAVE_SSL help text synced
This commit is contained in:
Peter Kokot 2024-07-27 11:20:07 +02:00 • committed by GitHub
parent c53b272f67
commit a1b45bb87a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/ftp/config.m4
View file

@ -20,7 +20,7 @@ if test "$PHP_FTP" = "yes"; then
test -z "$PHP_OPENSSL" && PHP_OPENSSL=no test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
if test "$PHP_OPENSSL" != "no" || test "$PHP_FTP_SSL" != "no"; then 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]) PHP_SUBST([FTP_SHARED_LIBADD])
AC_DEFINE(HAVE_FTP_SSL,1,[Whether FTP over SSL is supported]) AC_DEFINE(HAVE_FTP_SSL,1,[Whether FTP over SSL is supported])
fi fi

2
ext/intl/config.m4
View file

@ -4,7 +4,7 @@ PHP_ARG_ENABLE([intl],
[Enable internationalization support])]) [Enable internationalization support])])
if test "$PHP_INTL" != "no"; then if test "$PHP_INTL" != "no"; then
PHP_SETUP_ICU(INTL_SHARED_LIBADD) PHP_SETUP_ICU([INTL_SHARED_LIBADD])
PHP_SUBST([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" 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 \ PHP_NEW_EXTENSION(intl, php_intl.c \

2
ext/mysqlnd/config.w32
View file

@ -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_COMPRESSION_ENABLED", 1, "Define to 1 if mysqlnd has compressed protocol support.");
AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support"); AC_DEFINE("MYSQLND_SSL_SUPPORTED", 1, "SSL support");
if (CHECK_LIB("crypt32.lib", "mysqlnd")) { 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"); PHP_INSTALL_HEADERS("", "ext/mysqlnd");

4
ext/mysqlnd/config9.m4
View file

@ -35,7 +35,9 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
test -z "$PHP_OPENSSL" && PHP_OPENSSL=no test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
if test "$PHP_OPENSSL" != "no" || test "$PHP_MYSQLND_SSL" != "no"; then 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 fi
PHP_NEW_EXTENSION([mysqlnd], m4_normalize([ PHP_NEW_EXTENSION([mysqlnd], m4_normalize([