[php-src] master: Use AC_SUBST instead of PHP_SUBST_OLD where possible (#13993)
| From: | Peter Kokot via GitHub | Date: | Thu, 18 Apr 2024 20:17:34 +0000 |
| Subject: | [php-src] master: Use AC_SUBST instead of PHP_SUBST_OLD where possible (#13993) | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-128159@lists.php.net to get a copy of this message | ||
Author: Peter Kokot (petk)
Committer: GitHub (web-flow)
Pusher: petk
Date: 2024-04-18T22:17:27+02:00
Commit: https://github.com/php/php-src/commit/6fed6d85db698e1720833faf3dabd8b97eb2035f
Raw diff: https://github.com/php/php-src/commit/6fed6d85db698e1720833faf3dabd8b97eb2035f.diff
Use AC_SUBST instead of PHP_SUBST_OLD where possible (#13993)
The PHP_SUBST_OLD adds variables to generated Makefile and creates
output shell variables to replace the @variable_name@ placeholders in
templates. These changed variables are not used in the generated
Makefile so the AC_SUBST is sufficient.
- ext/odbc
- sapi/embed
- sapi/fpm
- only substituted in scripts/php-config.in:
- PHP_INSTALLED_SAPIS
- SAPI_LIBNAME_SHARED
- SAPI_LIBNAME_STATIC
Changed paths:
M configure.ac
M ext/odbc/config.m4
M sapi/embed/config.m4
M sapi/fpm/config.m4
Diff:
diff --git a/configure.ac b/configure.ac
index bc73decf6f42e..2d34277cf4e8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1474,6 +1474,9 @@ AC_SUBST(EXPANDED_SYSCONFDIR)
AC_SUBST(EXPANDED_LOCALSTATEDIR)
AC_SUBST(EXPANDED_PHP_CONFIG_FILE_PATH)
AC_SUBST(EXPANDED_PHP_CONFIG_FILE_SCAN_DIR)
+AC_SUBST([PHP_INSTALLED_SAPIS])
+AC_SUBST([SAPI_LIBNAME_SHARED])
+AC_SUBST([SAPI_LIBNAME_STATIC])
PHP_UTILIZE_RPATHS
@@ -1500,8 +1503,6 @@ if test -n "${PHP_BUILD_ARCH}"; then
AC_DEFINE_UNQUOTED(PHP_BUILD_ARCH,"$PHP_BUILD_ARCH",[build architecture])
fi
-PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
-
PHP_SUBST(PHP_FASTCGI_OBJS)
PHP_SUBST(PHP_SAPI_OBJS)
PHP_SUBST(PHP_BINARY_OBJS)
@@ -1563,8 +1564,6 @@ PHP_SUBST(SHELL)
PHP_SUBST(PHP_FRAMEWORKS)
PHP_SUBST(PHP_FRAMEWORKPATH)
PHP_SUBST(INSTALL_HEADERS)
-PHP_SUBST_OLD(SAPI_LIBNAME_SHARED)
-PHP_SUBST_OLD(SAPI_LIBNAME_STATIC)
old_CC=$CC
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index aa0ca04499eb7..d219daaf0338c 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -454,10 +454,10 @@ if test -n "$ODBC_TYPE"; then
PHP_SUBST(ODBC_SHARED_LIBADD)
PHP_SUBST(ODBC_INCDIR)
PHP_SUBST(ODBC_LIBDIR)
- PHP_SUBST_OLD(ODBC_CFLAGS)
- PHP_SUBST_OLD(ODBC_LIBS)
- PHP_SUBST_OLD(ODBC_LFLAGS)
- PHP_SUBST_OLD(ODBC_TYPE)
+ AC_SUBST([ODBC_CFLAGS])
+ AC_SUBST([ODBC_LIBS])
+ AC_SUBST([ODBC_LFLAGS])
+ AC_SUBST([ODBC_TYPE])
PHP_NEW_EXTENSION(odbc, php_odbc.c odbc_utils.c, $ext_shared,, [$ODBC_CFLAGS
-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
else
diff --git a/sapi/embed/config.m4 b/sapi/embed/config.m4
index 808eb75f39cb9..f9838f1d08c11 100644
--- a/sapi/embed/config.m4
+++ b/sapi/embed/config.m4
@@ -29,7 +29,7 @@ if test "$PHP_EMBED" != "no"; then
PHP_INSTALL_HEADERS([sapi/embed], [php_embed.h])
fi
AC_MSG_RESULT([$PHP_EMBED_TYPE])
- PHP_SUBST_OLD(PHP_EMBED_TYPE)
+ AC_SUBST([PHP_EMBED_TYPE])
else
AC_MSG_RESULT(no)
fi
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index d80f1334aee9c..339e3add944a8 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -550,7 +550,7 @@ if test "$PHP_FPM" != "no"; then
CFLAGS="$CFLAGS_save"
fi
- PHP_SUBST_OLD(php_fpm_systemd)
+ AC_SUBST([php_fpm_systemd])
AC_DEFINE_UNQUOTED(PHP_FPM_SYSTEMD, "$php_fpm_systemd", [fpm systemd service type])
if test -z "$PHP_FPM_USER" || test "$PHP_FPM_USER" = "yes" || test
"$PHP_FPM_USER" = "no"; then
@@ -565,14 +565,14 @@ if test "$PHP_FPM" != "no"; then
php_fpm_group="$PHP_FPM_GROUP"
fi
- PHP_SUBST_OLD(php_fpm_user)
- PHP_SUBST_OLD(php_fpm_group)
+ AC_SUBST([php_fpm_user])
+ AC_SUBST([php_fpm_group])
php_fpm_sysconfdir=
eval echo $sysconfdir
- PHP_SUBST_OLD(php_fpm_sysconfdir)
+ AC_SUBST([php_fpm_sysconfdir])
php_fpm_localstatedir=eval echo $localstatedir
- PHP_SUBST_OLD(php_fpm_localstatedir)
+ AC_SUBST([php_fpm_localstatedir])
php_fpm_prefix=eval echo $prefix
- PHP_SUBST_OLD(php_fpm_prefix)
+ AC_SUBST([php_fpm_prefix])
AC_DEFINE_UNQUOTED(PHP_FPM_USER, "$php_fpm_user", [fpm user name])
AC_DEFINE_UNQUOTED(PHP_FPM_GROUP, "$php_fpm_group", [fpm group name])