diff options
| author | foobar <sniper@php.net> | 2003-03-18 02:13:49 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-03-18 02:13:49 +0000 |
| commit | 980bac69f9e28e57641162b930cc9aed7e951b06 (patch) | |
| tree | 47f82a9f0f19d98635d4885531997f35acdff6fd | |
| parent | 14e9434586fecf1d73caa0430910fabf85fce743 (diff) | |
| download | php-git-980bac69f9e28e57641162b930cc9aed7e951b06.tar.gz | |
Fixed bug #22751 (Compile error in gdcache when external libgd is used)
| -rw-r--r-- | ext/gd/config.m4 | 1 | ||||
| -rw-r--r-- | ext/gd/gdcache.c | 2 |
2 files changed, 2 insertions, 1 deletions
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" |