diff options
| author | Remi Collet <remi@php.net> | 2013-05-08 07:37:40 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2013-05-08 07:37:40 +0200 |
| commit | 36eee5b994a1da413330f96020c3dec1378a89f7 (patch) | |
| tree | 7d3279db8b21c5229c53d3e79106e64f0779c350 /ext/gd | |
| parent | 5b121eb04d358f83e974b6c5fe069c38cf1f960b (diff) | |
| download | php-git-36eee5b994a1da413330f96020c3dec1378a89f7.tar.gz | |
Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
Diffstat (limited to 'ext/gd')
| -rw-r--r-- | ext/gd/config.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 957284e78f..50660af6cd 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -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, [ ]) |