com php-src: Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory: ext/gd/config.m4

Commit: 36eee5b994a1da413330f96020c3dec1378a89f7 Author: Remi Collet <remi@php.net> Wed, 8 May 2013 07:37:40 +0200 Parents: 5b121eb04d358f83e974b6c5fe069c38cf1f960b Branches: PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=36eee5b994a1da413330f96020c3dec1378a89f7 Log: Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory Bugs: https://bugs.php.net/64785 Changed paths: M ext/gd/config.m4 Diff: diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 957284e..50660af 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, [ ])