Skip to content

Commit 3cbf5aa

Browse files
authored
Normalize mysqlnd extension sources (#14654)
The m4_normalize() can simplify the list argument. It removes leading and trailing spaces and tabs, sequences of backslash-then-newline, and replaces multiple spaces, tabs, and newlines with a single space.
1 parent 0775d68 commit 3cbf5aa

File tree

1 file changed

+27
-9
lines changed

1 file changed

+27
-9
lines changed

ext/mysqlnd/config9.m4

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,6 @@ PHP_ARG_ENABLE([mysqlnd-compression-support],
2424

2525
dnl If some extension uses mysqlnd it will get compiled in PHP core
2626
if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
27-
mysqlnd_ps_sources="mysqlnd_ps.c mysqlnd_ps_codec.c"
28-
mysqlnd_base_sources="mysqlnd_connection.c mysqlnd_alloc.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
29-
mysqlnd_loaddata.c mysqlnd_reverse_api.c mysqlnd_vio.c mysqlnd_protocol_frame_codec.c \
30-
mysqlnd_statistics.c mysqlnd_driver.c mysqlnd_ext_plugin.c mysqlnd_auth.c \
31-
mysqlnd_result.c mysqlnd_result_meta.c mysqlnd_debug.c mysqlnd_commands.c \
32-
mysqlnd_block_alloc.c mysqlnd_read_buffer.c mysqlnd_plugin.c php_mysqlnd.c"
33-
3427
AS_VAR_IF([PHP_MYSQLND_COMPRESSION_SUPPORT], [no],,
3528
[PHP_SETUP_ZLIB([MYSQLND_SHARED_LIBADD],
3629
[AC_DEFINE([MYSQLND_COMPRESSION_ENABLED], [1],
@@ -45,8 +38,33 @@ if test "$PHP_MYSQLND" != "no" || test "$PHP_MYSQLND_ENABLED" = "yes"; then
4538
PHP_SETUP_OPENSSL(MYSQLND_SHARED_LIBADD, [AC_DEFINE(MYSQLND_HAVE_SSL,1,[Enable mysqlnd code that uses OpenSSL directly])])
4639
fi
4740

48-
mysqlnd_sources="$mysqlnd_base_sources $mysqlnd_ps_sources"
49-
PHP_NEW_EXTENSION(mysqlnd, $mysqlnd_sources, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
41+
PHP_NEW_EXTENSION([mysqlnd], [m4_normalize([
42+
mysqlnd_alloc.c
43+
mysqlnd_auth.c
44+
mysqlnd_block_alloc.c
45+
mysqlnd_charset.c
46+
mysqlnd_commands.c
47+
mysqlnd_connection.c
48+
mysqlnd_debug.c
49+
mysqlnd_driver.c
50+
mysqlnd_ext_plugin.c
51+
mysqlnd_loaddata.c
52+
mysqlnd_plugin.c
53+
mysqlnd_protocol_frame_codec.c
54+
mysqlnd_ps_codec.c
55+
mysqlnd_ps.c
56+
mysqlnd_read_buffer.c
57+
mysqlnd_result_meta.c
58+
mysqlnd_result.c
59+
mysqlnd_reverse_api.c
60+
mysqlnd_statistics.c
61+
mysqlnd_vio.c
62+
mysqlnd_wireprotocol.c
63+
php_mysqlnd.c
64+
])],
65+
[$ext_shared],,
66+
[-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
67+
5068
PHP_INSTALL_HEADERS([ext/mysqlnd/])
5169
PHP_SUBST([MYSQLND_SHARED_LIBADD])
5270
fi

0 commit comments

Comments
 (0)