From: Sander Roobol <sander@php.net>
Date: Sun, 9 Jun 2002 12:44:33 +0000 (+0000)
Subject: Made phpinfo() show if we're using the bundled version of GD
X-Git-Tag: php5_5_0~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c5dc21f8c23a4f4a81a3b0dc9331719fa8246a72;p=php

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 0c50452c50..35e49b348b 100644
--- 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 4554387802..88e54f1334 100644
--- 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");