cvs: php4 /ext/gd config.m4
| From: | Ilia Alshanetsky | Date: | Sun, 17 Nov 2002 20:18:45 +0000 |
| Subject: | cvs: php4 /ext/gd config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-16359@lists.php.net to get a copy of this message | ||
iliaa Sun Nov 17 15:18:45 2002 EDT
Modified files:
/php4/ext/gd config.m4
Log:
A better gd >=2.0.4 version check for non-bundled gd library.
Index: php4/ext/gd/config.m4
diff -u php4/ext/gd/config.m4:1.120 php4/ext/gd/config.m4:1.121
--- php4/ext/gd/config.m4:1.120 Tue Oct 29 20:05:15 2002
+++ php4/ext/gd/config.m4 Sun Nov 17 15:18:44 2002
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.120 2002/10/30 01:05:15 iliaa Exp $
+dnl $Id: config.m4,v 1.121 2002/11/17 20:18:44 iliaa Exp $
dnl
dnl
@@ -231,7 +231,6 @@
PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
PHP_CHECK_LIBRARY(gd, gdImageCreateFromGd2, [AC_DEFINE(HAVE_GD_GD2, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
PHP_CHECK_LIBRARY(gd, gdImageCreateTrueColor, [AC_DEFINE(HAVE_LIBGD20, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
- PHP_CHECK_LIBRARY(gd, gdFreeFontCache, [AC_DEFINE(HAVE_LIBGD204, 1, [ ])], [], [
-L$GD_LIB $GD_SHARED_LIBADD ])
PHP_CHECK_LIBRARY(gd, gdImageSetTile, [AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
PHP_CHECK_LIBRARY(gd, gdImageEllipse, [AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
PHP_CHECK_LIBRARY(gd, gdImageSetBrush, [AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
@@ -243,6 +242,15 @@
PHP_CHECK_LIBRARY(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])], [],
[ -L$GD_LIB $GD_SHARED_LIBADD ])
])
+dnl
+dnl Check for gd 2.0.4 greater availability
+dnl
+
+AC_TRY_COMPILE([
+ #include <gd.h>
+], [gdIOCtx *ctx; ctx->ctx.gd_free = 1;],[],
+[AC_DEFINE(HAVE_LIBGD204, 1, [ ])]
+)
dnl
dnl Main GD configure