From ac4f53718bd1ce3c434e19cbc32b8d00f2fab738 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Tue, 23 Jul 2024 23:57:36 +0200 Subject: [PATCH] Autotools: Normalize ext/fileinfo sources --- ext/fileinfo/config.m4 | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 index 9e3dd7743518..d778442c60f4 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -5,14 +5,27 @@ PHP_ARG_ENABLE([fileinfo], [yes]) if test "$PHP_FILEINFO" != "no"; then - - libmagic_sources=" \ - libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \ - libmagic/cdf.c libmagic/cdf_time.c libmagic/compress.c \ - libmagic/encoding.c libmagic/fsmagic.c libmagic/funcs.c \ - libmagic/is_json.c libmagic/is_tar.c libmagic/is_simh.c libmagic/magic.c libmagic/print.c \ - libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c \ - libmagic/buffer.c libmagic/is_csv.c" + libmagic_sources=m4_normalize([" + libmagic/apprentice.c + libmagic/apptype.c + libmagic/ascmagic.c + libmagic/buffer.c + libmagic/cdf_time.c + libmagic/cdf.c + libmagic/compress.c + libmagic/der.c + libmagic/encoding.c + libmagic/fsmagic.c + libmagic/funcs.c + libmagic/is_csv.c + libmagic/is_json.c + libmagic/is_simh.c + libmagic/is_tar.c + libmagic/magic.c + libmagic/print.c + libmagic/readcdf.c + libmagic/softmagic.c + "]) AC_CHECK_HEADERS([sys/sysmacros.h]) @@ -23,7 +36,10 @@ if test "$PHP_FILEINFO" != "no"; then AX_GCC_FUNC_ATTRIBUTE([visibility]) - PHP_NEW_EXTENSION(fileinfo, fileinfo.c php_libmagic.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) + PHP_NEW_EXTENSION([fileinfo], + [fileinfo.c php_libmagic.c $libmagic_sources], + [$ext_shared],, + [-I@ext_srcdir@/libmagic]) PHP_ADD_BUILD_DIR([$ext_builddir/libmagic]) AC_CHECK_FUNCS([utimes strndup])