From: Remi Collet <remi@php.net>
Date: Wed, 8 May 2013 05:37:40 +0000 (+0200)
Subject: Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
X-Git-Tag: php-5.5.0RC1~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36eee5b994a1da413330f96020c3dec1378a89f7;p=php

Fixed bug #64785 : restore 5.4 behaviour, libpng is mandatory
---

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, [ ])