From 21da040e10a6e8ae96ce756cf31b3941c07efbbe Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 1 Jul 2024 14:34:24 +0200
Subject: [PATCH] Sync PHP_SUBST_OLD

- All arguments quoted
- PHP_VERSION, PHP_VERSION_ID, PHP_LDFLAGS are used only in templates
  with @...@ placeholders
- These are not used in generated Makefile neither in templates:
  abs_builddir, abs_srcdir, DEBUG_CFLAGS
- These are used only in generated Makefile: EXTRA_LDFLAGS,
  EXTRA_LDFLAGS_PROGRAM, ZEND_EXTRA_LIBS, INCLUDES, EXTRA_INCLUDES,
  INSTALL_IT, NATIVE_RPATHS
---
 build/php.m4 |  8 ++++----
 configure.ac | 35 +++++++++++++++--------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/build/php.m4 b/build/php.m4
index fea49a7fefcc7..26eede85f6755 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1532,8 +1532,8 @@ dnl .sl
 dnl
 AC_DEFUN([PHP_SHLIB_SUFFIX_NAMES],[
  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
- PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
- PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
+ PHP_SUBST_OLD([SHLIB_SUFFIX_NAME])
+ PHP_SUBST_OLD([SHLIB_DL_SUFFIX_NAME])
  SHLIB_SUFFIX_NAME=so
  SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
  case $host_alias in
@@ -2068,8 +2068,8 @@ dnl
 AC_DEFUN([PHP_CONFIG_NICE],[
   AC_REQUIRE([AC_PROG_EGREP])
   AC_REQUIRE([AC_PROG_SED])
-  PHP_SUBST_OLD(EGREP)
-  PHP_SUBST_OLD(SED)
+  PHP_SUBST_OLD([EGREP])
+  PHP_SUBST_OLD([SED])
   test -f $1 && mv $1 $1.old
   rm -f $1.old
   cat >$1<<EOF
diff --git a/configure.ac b/configure.ac
index a446092955eac..873dd4bd6b8d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1453,6 +1453,9 @@ AC_SUBST([EXPANDED_PHP_CONFIG_FILE_SCAN_DIR])
 AC_SUBST([PHP_INSTALLED_SAPIS])
 AC_SUBST([SAPI_LIBNAME_SHARED])
 AC_SUBST([SAPI_LIBNAME_STATIC])
+AC_SUBST([PHP_VERSION])
+AC_SUBST([PHP_VERSION_ID])
+AC_SUBST([PHP_LDFLAGS])
 
 PHP_UTILIZE_RPATHS
 
@@ -1487,17 +1490,13 @@ PHP_SUBST(PHP_GLOBAL_OBJS)
 PHP_SUBST(PHP_BINARIES)
 PHP_SUBST(PHP_MODULES)
 PHP_SUBST(PHP_ZEND_EX)
-
-PHP_SUBST_OLD(abs_builddir)
-PHP_SUBST_OLD(abs_srcdir)
-
 PHP_SUBST(bindir)
 PHP_SUBST(sbindir)
 PHP_SUBST(exec_prefix)
-PHP_SUBST_OLD(program_prefix)
-PHP_SUBST_OLD(program_suffix)
+PHP_SUBST_OLD([program_prefix])
+PHP_SUBST_OLD([program_suffix])
 PHP_SUBST(includedir)
-PHP_SUBST_OLD(orig_libdir)
+PHP_SUBST_OLD([orig_libdir])
 PHP_SUBST(libdir)
 PHP_SUBST(mandir)
 PHP_SUBST(phptempdir)
@@ -1517,24 +1516,20 @@ PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)
 PHP_SUBST(CXXFLAGS)
 PHP_SUBST(CXXFLAGS_CLEAN)
-PHP_SUBST_OLD(DEBUG_CFLAGS)
-PHP_SUBST_OLD(EXTENSION_DIR)
-PHP_SUBST_OLD(EXTRA_LDFLAGS)
-PHP_SUBST_OLD(EXTRA_LDFLAGS_PROGRAM)
-PHP_SUBST_OLD(EXTRA_LIBS)
-PHP_SUBST_OLD(ZEND_EXTRA_LIBS)
-PHP_SUBST_OLD(INCLUDES)
-PHP_SUBST_OLD(EXTRA_INCLUDES)
-PHP_SUBST_OLD(INSTALL_IT)
+PHP_SUBST_OLD([EXTENSION_DIR])
+PHP_SUBST([EXTRA_LDFLAGS])
+PHP_SUBST([EXTRA_LDFLAGS_PROGRAM])
+PHP_SUBST_OLD([EXTRA_LIBS])
+PHP_SUBST([ZEND_EXTRA_LIBS])
+PHP_SUBST([INCLUDES])
+PHP_SUBST([EXTRA_INCLUDES])
+PHP_SUBST([INSTALL_IT])
 PHP_SUBST(LIBTOOL)
 PHP_SUBST(LN_S)
-PHP_SUBST_OLD(NATIVE_RPATHS)
-PHP_SUBST_OLD(PHP_LDFLAGS)
+PHP_SUBST([NATIVE_RPATHS])
 PHP_SUBST(OVERALL_TARGET)
 PHP_SUBST(PHP_RPATHS)
 PHP_SUBST(PHP_SAPI)
-PHP_SUBST_OLD(PHP_VERSION)
-PHP_SUBST_OLD(PHP_VERSION_ID)
 PHP_SUBST(SHELL)
 PHP_SUBST(PHP_FRAMEWORKS)
 PHP_SUBST(PHP_FRAMEWORKPATH)