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_INSTALL_HEADERS arguments (#15620)

Browse source 
The m4_normalize(m4_expand([...])) simplifies working with a list of
header files. The m4_normalize() is at this point still used in the
php-src config.m4 files because of copy/paste probability to community
extensions where the arguments still need to be done in the old style to
support phpize in PHP-8.3 and earlier. For example:

    PHP_INSTALL_HEADERS([ext/dom], m4_normalize([
      dom_ce.h
      namespace_compat.h
      xml_common.h
      xpath_callbacks.h
    ]))

When PHP 8.4 will be the minimum supported PHP version, the headers can
be installed without using m4_normalize() in PECL extensions. For
example:

    PHP_INSTALL_HEADERS([ext/dom], [
      dom_ce.h
      namespace_compat.h
      xml_common.h
      xpath_callbacks.h
    ])
This commit is contained in:
Peter Kokot 2024-08-28 23:08:53 +02:00 • committed by GitHub
parent 09c498233e
commit 0a0d2d0631
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
build/php.m4
View file

@ -2030,24 +2030,25 @@ dnl Misc. macros
dnl ----------------------------------------------------------------------------
dnl
dnl PHP_INSTALL_HEADERS(path [, file ...])
dnl PHP_INSTALL_HEADERS(path [, files ...])
dnl
dnl PHP header files to be installed.
dnl Add PHP header files to the list to be installed on the system. The "files"
dnl argument is a blank-or-newline-separated list of header files or directories
dnl located in the "path". If 2nd argument is not given, it installs header
dnl files in all paths from the blank-or-newline-separated "path" argument.
dnl
AC_DEFUN([PHP_INSTALL_HEADERS],[
ifelse([$2],[],[
for header_file in $1; do
PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
INSTALL_HEADERS="$INSTALL_HEADERS $header_file"
])
AC_DEFUN([PHP_INSTALL_HEADERS],
[m4_ifblank([$2], [
for header_file in m4_normalize(m4_expand([$1])); do
PHP_RUN_ONCE([INSTALLHEADERS], [$header_file],
[INSTALL_HEADERS="$INSTALL_HEADERS $header_file"])
done
], [
header_path=$1
for header_file in $2; do
for header_file in m4_normalize(m4_expand([$2])); do
hp_hf="$header_path/$header_file"
PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
])
PHP_RUN_ONCE([INSTALLHEADERS], [$hp_hf],
[INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"])
done
])
])