php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Autotools: Normalize ext/mbstring installed headers (#15097)

Browse Source 
This uses the default PHP_INSTALL_HEADERS macro instead of a wrapper,
making this in tune with the rest of the extensions.
This commit is contained in:
Peter Kokot
2024-07-24 22:41:16 +02:00
committed by GitHub
parent ce8ffedccf
commit b0db5e76a0
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ext/mbstring/config.m4
View File

@@ -18,10 +18,6 @@ AC_DEFUN([PHP_MBSTRING_ADD_CFLAG], [
PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS $1"
])
AC_DEFUN([PHP_MBSTRING_ADD_INSTALL_HEADERS], [
PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS $1"
])
AC_DEFUN([PHP_MBSTRING_EXTENSION], [
PHP_NEW_EXTENSION(mbstring, $PHP_MBSTRING_BASE_SOURCES $PHP_MBSTRING_SOURCES, $ext_shared,, $PHP_MBSTRING_CFLAGS -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
PHP_SUBST([MBSTRING_SHARED_LIBADD])
@@ -45,8 +41,7 @@ AC_DEFUN([PHP_MBSTRING_EXTENSION], [
#include "$out"
EOF
PHP_MBSTRING_ADD_INSTALL_HEADERS([mbstring.h])
PHP_INSTALL_HEADERS([ext/mbstring], [$PHP_MBSTRING_INSTALL_HEADERS])
PHP_INSTALL_HEADERS([ext/mbstring], [mbstring.h])
])
AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
@@ -80,7 +75,7 @@ AC_DEFUN([PHP_MBSTRING_SETUP_MBREGEX], [
AC_DEFINE([HAVE_MBREGEX], 1, [whether to have multibyte regex support])
PHP_MBSTRING_ADD_BASE_SOURCES([php_mbregex.c])
PHP_MBSTRING_ADD_INSTALL_HEADERS([php_mbregex.h php_onig_compat.h])
PHP_INSTALL_HEADERS([ext/mbstring], [php_mbregex.h php_onig_compat.h])
fi
])
@@ -133,7 +128,23 @@ AC_DEFUN([PHP_MBSTRING_SETUP_LIBMBFL], [
libmbfl/nls/nls_tr.c
libmbfl/nls/nls_ua.c
])
PHP_MBSTRING_ADD_INSTALL_HEADERS([libmbfl/config.h libmbfl/mbfl/eaw_table.h libmbfl/mbfl/mbfilter.h libmbfl/mbfl/mbfilter_8bit.h libmbfl/mbfl/mbfilter_pass.h libmbfl/mbfl/mbfilter_wchar.h libmbfl/mbfl/mbfl_consts.h libmbfl/mbfl/mbfl_convert.h libmbfl/mbfl/mbfl_defs.h libmbfl/mbfl/mbfl_encoding.h libmbfl/mbfl/mbfl_filter_output.h libmbfl/mbfl/mbfl_language.h libmbfl/mbfl/mbfl_memory_device.h libmbfl/mbfl/mbfl_string.h])
PHP_INSTALL_HEADERS([ext/mbstring], m4_normalize([
libmbfl/config.h
libmbfl/mbfl/eaw_table.h
libmbfl/mbfl/mbfilter_8bit.h
libmbfl/mbfl/mbfilter_pass.h
libmbfl/mbfl/mbfilter_wchar.h
libmbfl/mbfl/mbfilter.h
libmbfl/mbfl/mbfl_consts.h
libmbfl/mbfl/mbfl_convert.h
libmbfl/mbfl/mbfl_defs.h
libmbfl/mbfl/mbfl_encoding.h
libmbfl/mbfl/mbfl_filter_output.h
libmbfl/mbfl/mbfl_language.h
libmbfl/mbfl/mbfl_memory_device.h
libmbfl/mbfl/mbfl_string.h
]))
])
dnl