sniper Tue Jan 4 01:51:58 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/gd config.m4 gd.c
Log:
- Fixed bug #31396 (compile fails with gd 2.0.33 without freetype)
http://cvs.php.net/diff.php/php-src/ext/gd/config.m4?r1=1.144.2.4&r2=1.144.2.5&ty=u
Index: php-src/ext/gd/config.m4
diff -u php-src/ext/gd/config.m4:1.144.2.4 php-src/ext/gd/config.m4:1.144.2.5
--- php-src/ext/gd/config.m4:1.144.2.4 Thu Dec 30 02:04:10 2004
+++ php-src/ext/gd/config.m4 Tue Jan 4 01:51:58 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.144.2.4 2004/12/30 07:04:10 sniper Exp $
+dnl $Id: config.m4,v 1.144.2.5 2005/01/04 06:51:58 sniper Exp $
dnl
dnl
@@ -258,8 +258,9 @@
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, gdNewDynamicCtxEx,
[AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 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 ])
])
dnl
@@ -309,6 +310,7 @@
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
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.294.2.6&r2=1.294.2.7&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.294.2.6 php-src/ext/gd/gd.c:1.294.2.7
--- php-src/ext/gd/gd.c:1.294.2.6 Wed Dec 29 16:40:42 2004
+++ php-src/ext/gd/gd.c Tue Jan 4 01:51:58 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.294.2.6 2004/12/29 21:40:42 iliaa Exp $ */
+/* $Id: gd.c,v 1.294.2.7 2005/01/04 06:51:58 sniper Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -337,7 +337,7 @@
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_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();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
