[php-src] master: Merge branch 'PHP-8.3'

From: Date: Mon, 18 Mar 2024 11:13:48 +0000
Subject: [php-src] master: Merge branch 'PHP-8.3'
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-127775@lists.php.net to get a copy of this message
Author: Peter Kokot (petk) Date: 2024-03-18T11:59:34+01:00 Commit: https://github.com/php/php-src/commit/4f7a3d9053c5b20458be4b6040872c935642a73e Raw diff: https://github.com/php/php-src/commit/4f7a3d9053c5b20458be4b6040872c935642a73e.diff Merge branch 'PHP-8.3' * PHP-8.3: Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests Changed paths: M ext/gd/config.m4 Diff: diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index b13b942a3c74d..d9c6d4f6ee0c2 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -150,6 +150,8 @@ dnl or run test insufficient. AC_DEFUN([PHP_GD_CHECK_FORMAT],[ old_LIBS="${LIBS}" LIBS="${LIBS} ${GD_SHARED_LIBADD}" + old_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}" AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd]) AC_LANG_PUSH([C]) AC_RUN_IFELSE([AC_LANG_SOURCE([ @@ -180,6 +182,7 @@ int main(int argc, char** argv) { AC_MSG_RESULT([no]) ]) AC_LANG_POP([C]) + CFLAGS="${old_CFLAGS}" LIBS="${old_LIBS}" ])

« previous php.cvs (#127775) next »