Skip to content

Commit 0346217

Browse files
authored
Autotools: Sync PHP_SUBST in ext/gd (#14751)
- Argument quoted - CFLAGS variable changed into normal shell variable - GDLIB_CFLAGS and GDLIB_LIBS are not used in the generated Makefile
1 parent 0c5d3db commit 0346217

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

ext/gd/config.m4

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,10 @@ dnl Various checks for GD features
226226
PHP_GD_FREETYPE2
227227
PHP_GD_JISX0208
228228

229-
PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GD_CFLAGS))
230-
PHP_ADD_BUILD_DIR($ext_builddir/libgd)
231229
GD_CFLAGS="-Wno-strict-prototypes -I$ext_srcdir/libgd $GD_CFLAGS"
230+
PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, [$GD_CFLAGS])
231+
PHP_ADD_BUILD_DIR($ext_builddir/libgd)
232+
232233
PHP_INSTALL_HEADERS([ext/gd], [php_gd.h libgd/])
233234

234235
PHP_TEST_BUILD(foobar, [], [
@@ -250,8 +251,5 @@ dnl Various checks for GD features
250251
], [ $GD_SHARED_LIBADD ])
251252
fi
252253

253-
PHP_SUBST(GD_CFLAGS)
254-
PHP_SUBST(GDLIB_CFLAGS)
255-
PHP_SUBST(GDLIB_LIBS)
256-
PHP_SUBST(GD_SHARED_LIBADD)
254+
PHP_SUBST([GD_SHARED_LIBADD])
257255
fi

0 commit comments

Comments
 (0)