From 6e57550f14113bd46bcd80378ab0cff9a9f86993 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Fri, 26 Jul 2024 23:30:20 +0200 Subject: [PATCH] Autotools: Normalize DTrace sources argument (#15111) Using the m4_normalize, the source files can be added more intuitively using blank-or-newline delimited list of files. This adds also some basic help text. --- build/php.m4 | 7 ++++++- configure.ac | 13 ++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/build/php.m4 b/build/php.m4 index 53d13fb585f..968d03e1abf 100644 --- a/build/php.m4 +++ b/build/php.m4 @@ -2270,6 +2270,11 @@ AS_VAR_IF([php_cv_have_write_stdout], [yes], dnl dnl PHP_INIT_DTRACE(providerdesc, header-file, sources [, module]) dnl +dnl Initialize the DTrace support using the DTrace "providerdesc" file and +dnl generate "header-file". The "sources" is a blank-or-newline-separated list +dnl of files. The optional "module" is PHP extension name or path when used in +dnl extensions. +dnl AC_DEFUN([PHP_INIT_DTRACE], [AC_CHECK_HEADER([sys/sdt.h],, [AC_MSG_ERROR([Cannot find sys/sdt.h which is required for DTrace support.])]) @@ -2308,7 +2313,7 @@ dnl Add providerdesc.o or .lo into global objects when needed. dnl DTrace objects. old_IFS=[$]IFS - for ac_src in $3; do + for ac_src in m4_normalize([$3]); do IFS=. set $ac_src ac_obj=[$]1 diff --git a/configure.ac b/configure.ac index 549d24eb2a1..5cbfa40d229 100644 --- a/configure.ac +++ b/configure.ac @@ -1020,11 +1020,14 @@ PHP_ARG_ENABLE([dtrace], [no]) AS_VAR_IF([PHP_DTRACE], [yes], - [PHP_INIT_DTRACE([Zend/zend_dtrace.d], - [Zend/zend_dtrace_gen.h], - [main/main.c Zend/zend_API.c \ - Zend/zend_execute.c Zend/zend_exceptions.c \ - Zend/zend_dtrace.c Zend/zend.c])]) + [PHP_INIT_DTRACE([Zend/zend_dtrace.d], [Zend/zend_dtrace_gen.h], [ + main/main.c + Zend/zend_API.c + Zend/zend_dtrace.c + Zend/zend_exceptions.c + Zend/zend_execute.c + Zend/zend.c + ])]) AC_MSG_CHECKING([how big to make fd sets]) PHP_ARG_ENABLE([fd-setsize],,