Skip to content

Commit 6cdff75

Browse files
authored
Autotools: Normalize ext/gd sources (#15086)
1 parent 9d25296 commit 6cdff75

File tree

1 file changed

+44
-11
lines changed

1 file changed

+44
-11
lines changed

ext/gd/config.m4

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,48 @@ dnl
200200
if test "$PHP_GD" != "no"; then
201201

202202
if test "$PHP_EXTERNAL_GD" = "no"; then
203-
extra_sources="libgd/gd.c libgd/gd_gd.c libgd/gd_gd2.c libgd/gd_io.c libgd/gd_io_dp.c \
204-
libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_webp.c libgd/gd_avif.c \
205-
libgd/gd_png.c libgd/gd_jpeg.c libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c \
206-
libgd/gdfontmb.c libgd/gdfontl.c libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c \
207-
libgd/gdcache.c libgd/gdkanji.c libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c \
208-
libgd/gd_topal.c libgd/gd_gif_in.c libgd/gd_xbm.c libgd/gd_gif_out.c libgd/gd_security.c \
209-
libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_rotate.c libgd/gd_color_match.c \
210-
libgd/gd_transform.c libgd/gd_crop.c libgd/gd_interpolation.c libgd/gd_matrix.c \
211-
libgd/gd_bmp.c libgd/gd_tga.c"
203+
extra_sources=m4_normalize(["
204+
libgd/gd_avif.c
205+
libgd/gd_bmp.c
206+
libgd/gd_color_match.c
207+
libgd/gd_crop.c
208+
libgd/gd_filter.c
209+
libgd/gd_gd.c
210+
libgd/gd_gd2.c
211+
libgd/gd_gif_in.c
212+
libgd/gd_gif_out.c
213+
libgd/gd_interpolation.c
214+
libgd/gd_io_dp.c
215+
libgd/gd_io_file.c
216+
libgd/gd_io_ss.c
217+
libgd/gd_io.c
218+
libgd/gd_jpeg.c
219+
libgd/gd_matrix.c
220+
libgd/gd_pixelate.c
221+
libgd/gd_png.c
222+
libgd/gd_rotate.c
223+
libgd/gd_security.c
224+
libgd/gd_ss.c
225+
libgd/gd_tga.c
226+
libgd/gd_topal.c
227+
libgd/gd_transform.c
228+
libgd/gd_wbmp.c
229+
libgd/gd_webp.c
230+
libgd/gd_xbm.c
231+
libgd/gd.c
232+
libgd/gdcache.c
233+
libgd/gdfontg.c
234+
libgd/gdfontl.c
235+
libgd/gdfontmb.c
236+
libgd/gdfonts.c
237+
libgd/gdfontt.c
238+
libgd/gdft.c
239+
libgd/gdhelpers.c
240+
libgd/gdkanji.c
241+
libgd/gdtables.c
242+
libgd/gdxpm.c
243+
libgd/wbmp.c
244+
"])
212245

213246
dnl These are always available with bundled library
214247
AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])
@@ -227,7 +260,7 @@ dnl Various checks for GD features
227260
PHP_GD_JISX0208
228261

229262
GD_CFLAGS="-Wno-strict-prototypes -I$ext_srcdir/libgd $GD_CFLAGS"
230-
PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, [$GD_CFLAGS])
263+
PHP_NEW_EXTENSION([gd], [gd.c $extra_sources], [$ext_shared],, [$GD_CFLAGS])
231264
PHP_ADD_BUILD_DIR([$ext_builddir/libgd])
232265

233266
PHP_INSTALL_HEADERS([ext/gd], [php_gd.h libgd/])
@@ -244,7 +277,7 @@ dnl Various checks for GD features
244277
AC_DEFINE(HAVE_LIBGD, 1, [ ])
245278
PHP_GD_CHECK_VERSION
246279

247-
PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared)
280+
PHP_NEW_EXTENSION([gd], [gd.c $extra_sources], [$ext_shared])
248281
PHP_INSTALL_HEADERS([ext/gd], [php_gd.h])
249282
PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
250283
AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])

0 commit comments

Comments
 (0)