From 0e2e8e0f139187dc1f63377f5a28ca54581e5a9c Mon Sep 17 00:00:00 2001
From: Peter Kokot <peterkokot@gmail.com>
Date: Sun, 14 Jul 2024 16:58:43 +0200
Subject: [PATCH] Autotools: Quote all PHP_ADD_BUILD_DIR arguments (#14947)

- All arguments quoted for consistency
- m4_normalize used where list of directories becomes a bit simpler to
  read and see the diff
---
 build/php.m4                  |  2 +-
 docs-old/unix-build-system.md |  2 +-
 ext/bcmath/config.m4          |  2 +-
 ext/date/config0.m4           |  2 +-
 ext/dba/config.m4             |  6 +++---
 ext/dom/config.m4             | 30 +++++++++++++++--------------
 ext/fileinfo/config.m4        |  2 +-
 ext/gd/config.m4              |  2 +-
 ext/hash/config.m4            |  4 ++--
 ext/intl/config.m4            | 36 ++++++++++++++++++-----------------
 ext/mbstring/config.m4        |  2 +-
 ext/opcache/config.m4         |  4 ++--
 ext/pcre/config0.m4           |  2 +-
 ext/standard/config.m4        |  2 +-
 sapi/fpm/config.m4            |  4 ++--
 15 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/build/php.m4 b/build/php.m4
index dc373be3512f4..185606adea948 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -958,7 +958,7 @@ dnl ---------------------------------------------- CLI static module
     esac
     EXT_CLI_STATIC="$EXT_CLI_STATIC $1;$ext_dir"
   fi
-  PHP_ADD_BUILD_DIR($ext_builddir)
+  PHP_ADD_BUILD_DIR([$ext_builddir])
 
 dnl Set for phpize builds only.
 dnl ---------------------------
diff --git a/docs-old/unix-build-system.md b/docs-old/unix-build-system.md
index f1d0b45e344df..b191a9343b71b 100644
--- a/docs-old/unix-build-system.md
+++ b/docs-old/unix-build-system.md
@@ -72,7 +72,7 @@ Now, you need to tell the build system that you want to build files in a
 directory called `$ext_builddir/lib`:
 
 ```m4
-PHP_ADD_BUILD_DIR($ext_builddir/lib)
+PHP_ADD_BUILD_DIR([$ext_builddir/lib])
 ```
 
 Make sure to call this after `PHP_NEW_EXTENSION`, because `$ext_builddir` is
diff --git a/ext/bcmath/config.m4 b/ext/bcmath/config.m4
index 4644276c443f6..d6480442e3f17 100644
--- a/ext/bcmath/config.m4
+++ b/ext/bcmath/config.m4
@@ -31,6 +31,6 @@ if test "$PHP_BCMATH" != "no"; then
   ])],
   [$ext_shared],,
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
-  PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src)
+  PHP_ADD_BUILD_DIR([$ext_builddir/libbcmath/src])
   AC_DEFINE(HAVE_BCMATH, 1, [Whether you have bcmath])
 fi
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index 5225399cb4d74..8aee3bc7185a2 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -10,7 +10,7 @@ timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse
 
 PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
 
-PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
+PHP_ADD_BUILD_DIR([$ext_builddir/lib], [1])
 PHP_ADD_INCLUDE([$ext_builddir/lib])
 PHP_ADD_INCLUDE([$ext_srcdir/lib])
 
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 267ee1aa7a646..fa498f929add7 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -702,9 +702,9 @@ if test "$HAVE_DBA" = "1"; then
   fi
   AC_DEFINE(HAVE_DBA, 1, [ ])
   PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c dba_tcadb.c dba_lmdb.c $cdb_sources $flat_sources $ini_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-  PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
-  PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
-  PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)
+  PHP_ADD_BUILD_DIR([$ext_builddir/libcdb])
+  PHP_ADD_BUILD_DIR([$ext_builddir/libflatfile])
+  PHP_ADD_BUILD_DIR([$ext_builddir/libinifile])
   PHP_SUBST([DBA_SHARED_LIBADD])
 else
   AC_MSG_RESULT(no)
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index f16804d468ba6..86516c5d4228c 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -41,20 +41,22 @@ if test "$PHP_DOM" != "no"; then
                             namednodemap.c xpath_callbacks.c \
                             $LEXBOR_SOURCES],
                             $ext_shared,,$PHP_LEXBOR_CFLAGS)
-    PHP_ADD_BUILD_DIR($ext_builddir/parentnode)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/core)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/dom/interfaces)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/html/tree/insertion_mode)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/html/tokenizer)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/html/interfaces)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/encoding)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/css/selectors)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/css/tokenizer)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/css/syntax/tokenizer)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/selectors-adapted)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/ns)
-    PHP_ADD_BUILD_DIR($ext_builddir/$LEXBOR_DIR/tag)
+    PHP_ADD_BUILD_DIR([m4_normalize([
+      $ext_builddir/parentnode
+      $ext_builddir/$LEXBOR_DIR/core
+      $ext_builddir/$LEXBOR_DIR/css/selectors
+      $ext_builddir/$LEXBOR_DIR/css/syntax/tokenizer
+      $ext_builddir/$LEXBOR_DIR/css/tokenizer
+      $ext_builddir/$LEXBOR_DIR/dom/interfaces
+      $ext_builddir/$LEXBOR_DIR/encoding
+      $ext_builddir/$LEXBOR_DIR/html/interfaces
+      $ext_builddir/$LEXBOR_DIR/html/tokenizer
+      $ext_builddir/$LEXBOR_DIR/html/tree/insertion_mode
+      $ext_builddir/$LEXBOR_DIR/ns
+      $ext_builddir/$LEXBOR_DIR/ports/posix/lexbor/core
+      $ext_builddir/$LEXBOR_DIR/selectors-adapted
+      $ext_builddir/$LEXBOR_DIR/tag
+    ])])
     PHP_SUBST([DOM_SHARED_LIBADD])
     PHP_INSTALL_HEADERS([ext/dom], [xml_common.h xpath_callbacks.h namespace_compat.h])
     PHP_ADD_EXTENSION_DEP(dom, libxml)
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index fa6c4d116be21..e8e460387a428 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -24,7 +24,7 @@ if test "$PHP_FILEINFO" != "no"; then
   AX_GCC_FUNC_ATTRIBUTE([visibility])
 
   PHP_NEW_EXTENSION(fileinfo, fileinfo.c php_libmagic.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
-  PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
+  PHP_ADD_BUILD_DIR([$ext_builddir/libmagic])
 
   AC_CHECK_FUNCS([utimes strndup])
 
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 1fd7a4a8275e6..2a22a1aeed807 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -228,7 +228,7 @@ dnl Various checks for GD features
 
     GD_CFLAGS="-Wno-strict-prototypes -I$ext_srcdir/libgd $GD_CFLAGS"
     PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, [$GD_CFLAGS])
-    PHP_ADD_BUILD_DIR($ext_builddir/libgd)
+    PHP_ADD_BUILD_DIR([$ext_builddir/libgd])
 
     PHP_INSTALL_HEADERS([ext/gd], [php_gd.h libgd/])
 
diff --git a/ext/hash/config.m4 b/ext/hash/config.m4
index c9cbd1f5c5de0..6770bcd578d5e 100644
--- a/ext/hash/config.m4
+++ b/ext/hash/config.m4
@@ -29,10 +29,10 @@ else
   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
   PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -I@ext_srcdir@/$SHA3_DIR -DKeccakP200_excluded -DKeccakP400_excluded -DKeccakP800_excluded -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
 
-  PHP_ADD_BUILD_DIR(ext/hash/$SHA3_DIR, 1)
+  PHP_ADD_BUILD_DIR([ext/hash/$SHA3_DIR], [1])
 fi
 
-PHP_ADD_BUILD_DIR(ext/hash/murmur, 1)
+PHP_ADD_BUILD_DIR([ext/hash/murmur], [1])
 
 EXT_HASH_SOURCES="hash.c hash_md.c hash_sha.c hash_ripemd.c hash_haval.c \
   hash_tiger.c hash_gost.c hash_snefru.c hash_whirlpool.c hash_adler32.c \
diff --git a/ext/intl/config.m4 b/ext/intl/config.m4
index 98ac6f40dc489..98b1f87a8f6d5 100644
--- a/ext/intl/config.m4
+++ b/ext/intl/config.m4
@@ -100,21 +100,23 @@ if test "$PHP_INTL" != "no"; then
     PHP_ADD_SOURCES_X(PHP_EXT_DIR(intl), $PHP_INTL_CXX_SOURCES, $PHP_INTL_CXX_FLAGS, shared_objects_intl, yes)
   fi
 
-  PHP_ADD_BUILD_DIR($ext_builddir/collator)
-  PHP_ADD_BUILD_DIR($ext_builddir/converter)
-  PHP_ADD_BUILD_DIR($ext_builddir/common)
-  PHP_ADD_BUILD_DIR($ext_builddir/formatter)
-  PHP_ADD_BUILD_DIR($ext_builddir/normalizer)
-  PHP_ADD_BUILD_DIR($ext_builddir/dateformat)
-  PHP_ADD_BUILD_DIR($ext_builddir/locale)
-  PHP_ADD_BUILD_DIR($ext_builddir/msgformat)
-  PHP_ADD_BUILD_DIR($ext_builddir/grapheme)
-  PHP_ADD_BUILD_DIR($ext_builddir/resourcebundle)
-  PHP_ADD_BUILD_DIR($ext_builddir/transliterator)
-  PHP_ADD_BUILD_DIR($ext_builddir/timezone)
-  PHP_ADD_BUILD_DIR($ext_builddir/calendar)
-  PHP_ADD_BUILD_DIR($ext_builddir/idn)
-  PHP_ADD_BUILD_DIR($ext_builddir/spoofchecker)
-  PHP_ADD_BUILD_DIR($ext_builddir/breakiterator)
-  PHP_ADD_BUILD_DIR($ext_builddir/uchar)
+  PHP_ADD_BUILD_DIR([m4_normalize([
+    $ext_builddir/breakiterator
+    $ext_builddir/calendar
+    $ext_builddir/collator
+    $ext_builddir/common
+    $ext_builddir/converter
+    $ext_builddir/dateformat
+    $ext_builddir/formatter
+    $ext_builddir/grapheme
+    $ext_builddir/idn
+    $ext_builddir/locale
+    $ext_builddir/msgformat
+    $ext_builddir/normalizer
+    $ext_builddir/resourcebundle
+    $ext_builddir/spoofchecker
+    $ext_builddir/timezone
+    $ext_builddir/transliterator
+    $ext_builddir/uchar
+  ])])
 fi
diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 00745bf9bacbc..54c511ae89d6c 100644
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -27,7 +27,7 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
   PHP_SUBST([MBSTRING_SHARED_LIBADD])
 
   for dir in $PHP_MBSTRING_EXTRA_BUILD_DIRS; do
-    PHP_ADD_BUILD_DIR([$ext_builddir/$dir], 1)
+    PHP_ADD_BUILD_DIR([$ext_builddir/$dir], [1])
   done
 
   for dir in $PHP_MBSTRING_EXTRA_INCLUDES; do
diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index d0f07741a9cf4..891efae9613b1 100644
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -345,8 +345,8 @@ int main(void) {
   fi
 
   if test "$PHP_OPCACHE_JIT" = "yes"; then
-    PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1)
-    PHP_ADD_BUILD_DIR([$ext_builddir/jit/ir], 1)
+    PHP_ADD_BUILD_DIR([$ext_builddir/jit], [1])
+    PHP_ADD_BUILD_DIR([$ext_builddir/jit/ir], [1])
     PHP_ADD_MAKEFILE_FRAGMENT([$ext_srcdir/jit/Makefile.frag])
   fi
   PHP_SUBST([OPCACHE_SHARED_LIBADD])
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 88aaaa619969b..7c9ccabd625da 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -84,6 +84,6 @@ else
         [Define to 1 if pcre has Valgrind support enabled.])])])
 
   PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,$PHP_PCRE_CFLAGS)
-  PHP_ADD_BUILD_DIR($ext_builddir/pcre2lib)
+  PHP_ADD_BUILD_DIR([$ext_builddir/pcre2lib])
   PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcre2lib/])
 fi
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index d46a892609007..12dcbd96bef6b 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -444,7 +444,7 @@ PHP_NEW_EXTENSION([standard], [m4_normalize([
 ])],,,
   [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
 
-PHP_ADD_BUILD_DIR($ext_builddir/libavifinfo)
+PHP_ADD_BUILD_DIR([$ext_builddir/libavifinfo])
 
 PHP_ADD_MAKEFILE_FRAGMENT
 PHP_INSTALL_HEADERS([ext/standard/])
diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index de0a86f1829f6..c88c0075acae1 100644
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -542,8 +542,8 @@ if test "$PHP_FPM" != "no"; then
   php_fpm_prefix=`eval echo $prefix`
   AC_SUBST([php_fpm_prefix])
 
-  PHP_ADD_BUILD_DIR(sapi/fpm/fpm)
-  PHP_ADD_BUILD_DIR(sapi/fpm/fpm/events)
+  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_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])