Skip to content

Autotools: Sync PHP_SETUP_* M4 macros #15117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2024
Merged

Autotools: Sync PHP_SETUP_* M4 macros #15117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/ftp/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ext/intl/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ext/mysqlnd/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 3 additions & 1 deletion ext/mysqlnd/config9.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([
Expand Down