From a2177b2e8e2cf102010d6e489214770ed092fc6e Mon Sep 17 00:00:00 2001 From: foobar Date: Tue, 4 Jan 2005 06:51:45 +0000 Subject: [PATCH] - Fixed bug #31396 (compile fails with gd 2.0.33 without freetype) --- ext/gd/config.m4 | 4 +++- ext/gd/gd.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 2fad1e8046..53ae8d3081 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -258,7 +258,8 @@ AC_DEFUN([PHP_GD_CHECK_VERSION],[ 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 ]) - PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_THREAD_SAFE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdFreeFontCache, [AC_DEFINE(HAVE_GD_FREEFONTCACHE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx, [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) ]) @@ -309,6 +310,7 @@ dnl These are always available with bundled library AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ]) AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ]) AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ]) + AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ]) AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ]) dnl Make sure the libgd/ is first in the include path diff --git a/ext/gd/gd.c b/ext/gd/gd.c index cbb90893c0..bf44f8b35b 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -337,7 +337,7 @@ zend_module_entry gd_module_entry = { PHP_MINIT(gd), PHP_MSHUTDOWN(gd), NULL, -#if HAVE_LIBGD20 && HAVE_GD_STRINGFT +#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) PHP_RSHUTDOWN(gd), #else NULL, @@ -456,10 +456,10 @@ PHP_MINIT_FUNCTION(gd) /* {{{ PHP_RSHUTDOWN_FUNCTION */ -#if HAVE_LIBGD20 && HAVE_GD_STRINGFT +#if HAVE_LIBGD20 && HAVE_GD_STRINGFT && (HAVE_GD_FONTCACHESHUTDOWN || HAVE_GD_FREEFONTCACHE) PHP_RSHUTDOWN_FUNCTION(gd) { -#if defined(HAVE_GD_THREAD_SAFE) || defined(HAVE_GD_BUNDLED) +#if HAVE_GD_FONTCACHESHUTDOWN gdFontCacheShutdown(); #else gdFreeFontCache(); -- 2.50.1