From b320832082884404c391e33561ce3fc114ad4be1 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 2 Jun 2024 21:48:33 +0200
Subject: [PATCH] Use AC_SUBST for CONFIGURE_COMMAND and CONFIGURE_OPTIONS

Instead of the PHP_SUBST_OLD, which also adds redundant variables to the
generated Makefile, these two can be done with AC_SUBST to be
substituted in the generated main/build-defs.h header and
scripts/php-config script.
---
 build/php.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/php.m4 b/build/php.m4
index f94c28c2452d3..40db6023136b9 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -2029,8 +2029,8 @@ EOF
   echo '"[$]@"' >> $1
   chmod +x $1
   CONFIGURE_COMMAND="$CONFIGURE_COMMAND $CONFIGURE_OPTIONS"
-  PHP_SUBST_OLD(CONFIGURE_COMMAND)
-  PHP_SUBST_OLD(CONFIGURE_OPTIONS)
+  AC_SUBST([CONFIGURE_COMMAND])
+  AC_SUBST([CONFIGURE_OPTIONS])
 ])
 
 dnl