mirror of
https://github.com/php/php-src.git
synced 2024-09-21 09:57:23 +00:00
Fix GH-12019: ext/gd/config.m4: don't forget GDLIB_CFLAGS in feature tests
In commit 85e5635a
, a feature test for the various libgd image formats
was added. That test however erroneously omits the GDLIB_CFLAGS (from
pkg-config) during compilation. This can lead to build failures and
therefore false negatives from the test.
Here, we add $GDLIB_CFLAGS to $CFLAGS for the duration of the test.
Closes GH-12019
This commit is contained in:
parent
868257a3de
commit
00799320ec
3
NEWS
3
NEWS
@ -10,6 +10,9 @@ PHP NEWS
|
||||
. Add some missing ZPP checks. (nielsdos)
|
||||
. Fix potential memory leak in XPath evaluation results. (nielsdos)
|
||||
|
||||
- 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)
|
||||
|
@ -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}"
|
||||
])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user