Skip to content

Commit 7d3d8de

Browse files
authored
Fix erroneous dnl appended in configure (#14013)
This is a backport of commit 03f1553 to PHP-8.2 due to GH-14002 and fixes the PHP_CXX_COMPILE_STDCXX check in ext/intl whether the specified C++ standard is mandatory or optional. The `dnl` (Discard to Next Line) M4 macro in this combination of `m4_if` macros and arguments isn't properly replaced and a literal `dnl` string is appended in the configure script. The `[]dnl` works ok.
1 parent 891e4a5 commit 7d3d8de

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ PHP NEWS
1111
other timeout implementations). (Kévin Dunglas)
1212
. Fixed bug GH-14003 (Broken cleanup of unfinished calls with callable convert
1313
parameters). (ilutov)
14+
. Fixed bug GH-14013 (Erroneous dnl appended in configure). (Peter Kokot)
1415

1516
- Fibers:
1617
. Fixed bug GH-13903 (ASAN false positive underflow when executing copy()).

build/php_cxx_compile_stdcxx.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ AC_DEFUN([PHP_CXX_COMPILE_STDCXX], [dnl
2727
[$1], [14], [ax_cxx_compile_alternatives="14 1y"],
2828
[$1], [17], [ax_cxx_compile_alternatives="17 1z"],
2929
[$1], [20], [ax_cxx_compile_alternatives="20"],
30-
[m4_fatal([invalid first argument `$1' to PHP_CXX_COMPILE_STDCXX])])dnl
30+
[m4_fatal([invalid first argument `$1' to PHP_CXX_COMPILE_STDCXX])])[]dnl
3131
m4_if([$2], [], [ax_cxx_compile_cxx$1_required=true],
3232
[$2], [mandatory], [ax_cxx_compile_cxx$1_required=true],
3333
[$2], [optional], [ax_cxx_compile_cxx$1_required=false],
34-
[m4_fatal([invalid third argument `$2' to PHP_CXX_COMPILE_STDCXX])])dnl
34+
[m4_fatal([invalid third argument `$2' to PHP_CXX_COMPILE_STDCXX])])[]dnl
3535
AC_LANG_PUSH([C++])dnl
3636
ac_success=no
3737

0 commit comments

Comments
 (0)