From: foobar <sniper@php.net>
Date: Tue, 18 Mar 2003 02:14:22 +0000 (+0000)
Subject: MFH: Fixed bug #22751 (Compile error in gdcache when external libgd is used)
X-Git-Tag: php-4.3.2RC2~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fdc6b229a6685d340f434b4aa386740b6fdb51df;p=php

MFH: Fixed bug #22751 (Compile error in gdcache when external libgd is used)
---

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index deba71ee16..5cd0b76cfe 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -245,6 +245,7 @@ AC_DEFUN(PHP_GD_CHECK_VERSION,[
   PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB,     1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageColorResolve,    [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
   PHP_CHECK_LIBRARY(gd, gdImageGifCtx,          [AC_DEFINE(HAVE_GD_GIF_CTX,          1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+  PHP_CHECK_LIBRARY(gd, gdCacheCreate,          [AC_DEFINE(HAVE_GD_CACHE_CREATE,     1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
 ])
 
 dnl
diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c
index 2643d802b6..e3ff9b83ad 100644
--- a/ext/gd/gdcache.c
+++ b/ext/gd/gdcache.c
@@ -44,7 +44,7 @@
 #else
 #include "php_config.h"
 #endif
-#if HAVE_LIBTTF|HAVE_LIBFREETYPE
+#if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE)
 
 #include "gdcache.h"