archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Normalize PHP_OUTPUT arguments (#15177)

Browse source 
The m4_normalize([$1]) normalizes items into a single-space-separated
list of files to append them to the global PHP_OUTPUT_FILES variable
that is processed by AC_CONFIG_FILES. Redundant newlines are also
removed in the generated configure script.

PHP extensions using phpize can't use this macro so it's safe to change
this.
This commit is contained in:
Peter Kokot 2024-08-01 00:14:56 +02:00 • committed by GitHub
parent a578c27a51
commit c96f08aa70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build/php.m4
View file

@ -96,9 +96,8 @@ dnl
dnl Adds "file" to the list of files generated by AC_OUTPUT. This macro can be dnl Adds "file" to the list of files generated by AC_OUTPUT. This macro can be
dnl used several times. dnl used several times.
dnl dnl
AC_DEFUN([PHP_OUTPUT],[ AC_DEFUN([PHP_OUTPUT],
PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1" [AS_VAR_APPEND([PHP_OUTPUT_FILES], [" m4_normalize([$1])"])])
])
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
dnl Build system base macros. dnl Build system base macros.

9
sapi/fpm/config.m4
View file

@ -508,7 +508,14 @@ if test "$PHP_FPM" != "no"; then
PHP_ADD_BUILD_DIR([sapi/fpm/fpm]) PHP_ADD_BUILD_DIR([sapi/fpm/fpm])
PHP_ADD_BUILD_DIR([sapi/fpm/fpm/events]) 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/init.d.php-fpm
sapi/fpm/php-fpm.8
sapi/fpm/php-fpm.conf
sapi/fpm/php-fpm.service
sapi/fpm/status.html
sapi/fpm/www.conf
])
PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag]) PHP_ADD_MAKEFILE_FRAGMENT([$abs_srcdir/sapi/fpm/Makefile.frag])
SAPI_FPM_PATH=sapi/fpm/php-fpm SAPI_FPM_PATH=sapi/fpm/php-fpm