cvs: php4 /ext/gd config.m4 gd.c

sander Sun Jun 9 08:44:34 2002 EDT Modified files: /php4/ext/gd config.m4 gd.c Log: Made phpinfo() show if we're using the bundled version of GD Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.95 php4/ext/gd/config.m4:1.96 --- php4/ext/gd/config.m4:1.95 Sun Jun 9 07:27:04 2002 +++ php4/ext/gd/config.m4 Sun Jun 9 08:44:33 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.95 2002/06/09 11:27:04 sander Exp $ +dnl $Id: config.m4,v 1.96 2002/06/09 12:44:33 sander Exp $ dnl dnl @@ -260,6 +260,8 @@ AC_DEFINE(HAVE_GD_WBMP, 1, [ ]) AC_DEFINE(HAVE_GD_GD2, 1, [ ]) AC_DEFINE(HAVE_GD_PNG, 1, [ ]) + + AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ]) GDLIB_CFLAGS="-DHAVE_LIBPNG" Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.186 php4/ext/gd/gd.c:1.187 --- php4/ext/gd/gd.c:1.186 Mon Jun 3 22:33:10 2002 +++ php4/ext/gd/gd.c Sun Jun 9 08:44:33 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.186 2002/06/04 02:33:10 sniper Exp $ */ +/* $Id: gd.c,v 1.187 2002/06/09 12:44:33 sander Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -319,7 +319,9 @@ /* need to use a PHPAPI function here because it is external module in windows */ -#if HAVE_LIBGD20 +#if HAVE_GD_BUNDLED + php_info_print_table_row(2, "GD Version", "bundled (2.0 compatible)"); +#elif HAVE_LIBGD20 php_info_print_table_row(2, "GD Version", "2.0 or higher"); #elif HAVE_GDIMAGECOLORRESOLVE php_info_print_table_row(2, "GD Version", "1.6.2 or higher");