Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests

NEWS

@@ -16,6 +16,9 @@ PHP                                                                        NEWS
   . Fixed GH-11086 (FPM: config test runs twice in daemonised mode).
     (Jakub Zelenka)
 
+- GD:
+  . Fixed bug GH-12019 (add GDLIB_CFLAGS in feature tests). (Michael Orlitzky)
+
 - Gettext:
   . Fixed sigabrt raised with dcgettext/dcngettext calls with gettext 0.22.5
     with category set to LC_ALL. (David Carlier)

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