clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-25 11:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
This commit is contained in:
Remi Collet 2013-05-08 07:37:46 +02:00
commit 70e0118b1b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ext/gd/config.m4
View File

@ -266,6 +266,10 @@ dnl
dnl Common for both builtin and external GD
dnl
if test "$PHP_GD" != "no"; then
dnl PNG is required by GD library
test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes
dnl Various checks for GD features
PHP_GD_ZLIB
PHP_GD_TTSTR
@ -292,9 +296,6 @@ if test "$PHP_GD" = "yes"; then
dnl check for fabsf and floorf which are available since C99
AC_CHECK_FUNCS(fabsf floorf)
dnl PNG is required by GD library
test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes
dnl These are always available with bundled library
AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])
AC_DEFINE(HAVE_GD_PNG, 1, [ ])