Made phpinfo() show if we're using the bundled version of GD

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 0c50452c5043fc0fe75c08a658d71cac6bdd9805..35e49b348b1b201b9d257dc1a39d502b54289b0c 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -261,6 +261,8 @@ dnl These are always available with bundled library
   AC_DEFINE(HAVE_GD_GD2,              1, [ ])
   AC_DEFINE(HAVE_GD_PNG,              1, [ ])
 
+  AC_DEFINE(HAVE_GD_BUNDLED,          1, [ ])
+
   GDLIB_CFLAGS="-DHAVE_LIBPNG"
 
 dnl Depending which libraries were included to PHP configure,

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 45543878027166f1ced7a44d4537cfd78a98c7ee..88e54f13347962d0f5ff89f6a21139ffdc96e686 100644 (file)
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -319,7 +319,9 @@ PHP_MINFO_FUNCTION(gd)
 
        /* 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");