From a7f0fe1f3349514e42983ea03347a5b63ea186d4 Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 27 Jul 2024 05:26:32 +0200
Subject: [PATCH] Autotools: Quote macro arguments

- PHP_EXPAND_PATH
- PHP_LIBGCC_LIBPATH
- PHP_OUTPUT
- PHP_REMOVE_USR_LIB
---
 configure.ac                  | 6 +++---
 ext/phar/config.m4            | 2 +-
 sapi/apache2handler/config.m4 | 2 +-
 sapi/cgi/config9.m4           | 2 +-
 sapi/cli/config.m4            | 2 +-
 sapi/fpm/config.m4            | 2 +-
 sapi/phpdbg/config.m4         | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5cbfa40d229..0828f9150ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -948,7 +948,7 @@ PHP_ARG_ENABLE([libgcc],
   [no])
 
 if test "$PHP_LIBGCC" = "yes"; then
-  PHP_LIBGCC_LIBPATH(gcc)
+  PHP_LIBGCC_LIBPATH([gcc])
   if test -z "$libgcc_libpath"; then
     AC_MSG_ERROR([Cannot locate libgcc. Make sure that gcc is in your path])
   fi
@@ -1437,8 +1437,8 @@ AC_SUBST([PHP_LDFLAGS])
 
 PHP_UTILIZE_RPATHS
 
-PHP_REMOVE_USR_LIB(PHP_LDFLAGS)
-PHP_REMOVE_USR_LIB(LDFLAGS)
+PHP_REMOVE_USR_LIB([PHP_LDFLAGS])
+PHP_REMOVE_USR_LIB([LDFLAGS])
 
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PHP_LDFLAGS"
 EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM $PHP_LDFLAGS"
diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index ed155cab6e5..4c279f1489a 100644
--- a/ext/phar/config.m4
+++ b/ext/phar/config.m4
@@ -23,5 +23,5 @@ if test "$PHP_PHAR" != "no"; then
 
   PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])
 
-  PHP_OUTPUT(ext/phar/phar.1 ext/phar/phar.phar.1)
+  PHP_OUTPUT([ext/phar/phar.1 ext/phar/phar.phar.1])
 fi
diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
index c54299bf109..979dfed3bf8 100644
--- a/sapi/apache2handler/config.m4
+++ b/sapi/apache2handler/config.m4
@@ -14,7 +14,7 @@ if test "$PHP_APXS2" != "no"; then
       APXS=/usr/sbin/apxs
     fi
   else
-    PHP_EXPAND_PATH($PHP_APXS2, APXS)
+    PHP_EXPAND_PATH([$PHP_APXS2], [APXS])
   fi
 
   $APXS -q CFLAGS >/dev/null 2>&1
diff --git a/sapi/cgi/config9.m4 b/sapi/cgi/config9.m4
index bdd567e5c13..de195652320 100644
--- a/sapi/cgi/config9.m4
+++ b/sapi/cgi/config9.m4
@@ -55,5 +55,5 @@ if test "$PHP_CGI" != "no"; then
     PHP_SUBST([SAPI_CGI_PATH])
     PHP_SUBST([BUILD_CGI])
 
-    PHP_OUTPUT(sapi/cgi/php-cgi.1)
+    PHP_OUTPUT([sapi/cgi/php-cgi.1])
 fi
diff --git a/sapi/cli/config.m4 b/sapi/cli/config.m4
index 6bd9c03c20e..ebf8490d832 100644
--- a/sapi/cli/config.m4
+++ b/sapi/cli/config.m4
@@ -52,7 +52,7 @@ if test "$PHP_CLI" != "no"; then
   PHP_SUBST([SAPI_CLI_PATH])
   PHP_SUBST([BUILD_CLI])
 
-  PHP_OUTPUT(sapi/cli/php.1)
+  PHP_OUTPUT([sapi/cli/php.1])
 
   PHP_INSTALL_HEADERS([sapi/cli], [cli.h])
 fi
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index bbd13ed7376..e3f136f513f 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -508,7 +508,7 @@ if test "$PHP_FPM" != "no"; then
 
   PHP_ADD_BUILD_DIR([sapi/fpm/fpm])
   PHP_ADD_BUILD_DIR([sapi/fpm/fpm/events])
-  PHP_OUTPUT(sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html)
+  PHP_OUTPUT([sapi/fpm/php-fpm.conf sapi/fpm/www.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html])
   PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
 
   SAPI_FPM_PATH=sapi/fpm/php-fpm
diff --git a/sapi/phpdbg/config.m4 b/sapi/phpdbg/config.m4
index 369ea8d7305..af95f989bb3 100644
--- a/sapi/phpdbg/config.m4
+++ b/sapi/phpdbg/config.m4
@@ -98,5 +98,5 @@ if test "$PHP_PHPDBG" != "no"; then
   PHP_SUBST([BUILD_PHPDBG])
   PHP_SUBST([BUILD_PHPDBG_SHARED])
 
-  PHP_OUTPUT(sapi/phpdbg/phpdbg.1)
+  PHP_OUTPUT([sapi/phpdbg/phpdbg.1])
 fi