Merge branch 'PHP-8.3'

* PHP-8.3:
  Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests
This commit is contained in:
Peter Kokot 2024-03-18 11:59:34 +01:00
commit 4f7a3d9053
No known key found for this signature in database
GPG Key ID: 56322FE83A7566FC

View File

@ -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}"
])