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 deba71ee16de19a7f6fd58d30f878ff5dd4ad4c3..5cd0b76cfe9fb5025e141607fd3ffb2863303d53 100644 (file)
--- 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 2643d802b6d3605976cc4bf8eb4d6fd4fc0d370d..e3ff9b83addfe66c8c38547a3c911cf335df483b 100644 (file)
--- 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"