Skip to content

Commit 40cf2e1

Browse files
authored
Autotools: Normalize pcre sources (#15085)
1 parent 6cdff75 commit 40cf2e1

File tree

1 file changed

+38
-9
lines changed

1 file changed

+38
-9
lines changed

ext/pcre/config0.m4

Lines changed: 38 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,44 @@ if test "$PHP_EXTERNAL_PCRE" != "no"; then
4545
[AC_DEFINE([HAVE_PCRE_JIT_SUPPORT], [1])])
4646
])
4747

48-
PHP_NEW_EXTENSION(pcre, php_pcre.c, no,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
48+
PHP_NEW_EXTENSION([pcre],
49+
[php_pcre.c],
50+
[no],,
51+
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
4952
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
5053
else
5154
AC_MSG_CHECKING([for PCRE library to use])
5255
AC_MSG_RESULT([bundled])
53-
pcrelib_sources="pcre2lib/pcre2_auto_possess.c pcre2lib/pcre2_chartables.c pcre2lib/pcre2_compile.c \
54-
pcre2lib/pcre2_config.c pcre2lib/pcre2_context.c pcre2lib/pcre2_chkdint.c pcre2lib/pcre2_dfa_match.c pcre2lib/pcre2_error.c \
55-
pcre2lib/pcre2_jit_compile.c pcre2lib/pcre2_maketables.c pcre2lib/pcre2_match.c pcre2lib/pcre2_match_data.c \
56-
pcre2lib/pcre2_newline.c pcre2lib/pcre2_ord2utf.c pcre2lib/pcre2_pattern_info.c pcre2lib/pcre2_serialize.c \
57-
pcre2lib/pcre2_string_utils.c pcre2lib/pcre2_study.c pcre2lib/pcre2_substitute.c pcre2lib/pcre2_substring.c \
58-
pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
59-
pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
56+
pcrelib_sources=m4_normalize(["
57+
pcre2lib/pcre2_auto_possess.c
58+
pcre2lib/pcre2_chartables.c
59+
pcre2lib/pcre2_chkdint.c
60+
pcre2lib/pcre2_compile.c
61+
pcre2lib/pcre2_config.c
62+
pcre2lib/pcre2_context.c
63+
pcre2lib/pcre2_convert.c
64+
pcre2lib/pcre2_dfa_match.c
65+
pcre2lib/pcre2_error.c
66+
pcre2lib/pcre2_extuni.c
67+
pcre2lib/pcre2_find_bracket.c
68+
pcre2lib/pcre2_jit_compile.c
69+
pcre2lib/pcre2_maketables.c
70+
pcre2lib/pcre2_match_data.c
71+
pcre2lib/pcre2_match.c
72+
pcre2lib/pcre2_newline.c
73+
pcre2lib/pcre2_ord2utf.c
74+
pcre2lib/pcre2_pattern_info.c
75+
pcre2lib/pcre2_script_run.c
76+
pcre2lib/pcre2_serialize.c
77+
pcre2lib/pcre2_string_utils.c
78+
pcre2lib/pcre2_study.c
79+
pcre2lib/pcre2_substitute.c
80+
pcre2lib/pcre2_substring.c
81+
pcre2lib/pcre2_tables.c
82+
pcre2lib/pcre2_ucd.c
83+
pcre2lib/pcre2_valid_utf.c
84+
pcre2lib/pcre2_xclass.c
85+
"])
6086

6187
AX_CHECK_COMPILE_FLAG([-Wno-implicit-fallthrough],
6288
[PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"],,
@@ -88,7 +114,10 @@ else
88114
[AC_DEFINE([HAVE_PCRE_VALGRIND_SUPPORT], [1],
89115
[Define to 1 if pcre has Valgrind support enabled.])])])
90116

91-
PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,$PHP_PCRE_CFLAGS)
117+
PHP_NEW_EXTENSION([pcre],
118+
[$pcrelib_sources php_pcre.c],
119+
[no],,
120+
[$PHP_PCRE_CFLAGS])
92121
PHP_ADD_BUILD_DIR([$ext_builddir/pcre2lib])
93122
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcre2lib/])
94123
fi

0 commit comments

Comments
 (0)