From: Marcus Boerger <helly@php.net>
Date: Sat, 1 Feb 2003 23:23:59 +0000 (+0000)
Subject: Show if XPM support is available & Set availability bit only when available.
X-Git-Tag: RELEASE_0_5~1329
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=129bd74b455c9e6d1eebac016b1972422adf35b2;p=php

Show if XPM support is available & Set availability bit only when available.
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index 1b0c2f3235..cafd37ee30 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -479,6 +479,9 @@ PHP_MINFO_FUNCTION(gd)
 #ifdef HAVE_GD_WBMP
 	php_info_print_table_row(2, "WBMP Support", "enabled");
 #endif
+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
+	php_info_print_table_row(2, "XPM Support", "enabled");
+#endif
 #ifdef HAVE_GD_XBM
 	php_info_print_table_row(2, "XBM Support", "enabled");
 #endif
@@ -552,6 +555,11 @@ PHP_FUNCTION(gd_info)
 #else
 	add_assoc_bool(return_value, "WBMP Support", 0);
 #endif
+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
+	add_assoc_bool(return_value, "XPM Support", 1);
+#else
+	add_assoc_bool(return_value, "XPM Support", 0);
+#endif
 #ifdef HAVE_GD_XBM
 	add_assoc_bool(return_value, "XBM Support", 1);
 #else
@@ -1211,7 +1219,7 @@ PHP_FUNCTION(imagetypes)
 #ifdef HAVE_GD_WBMP
 	ret |= 8;
 #endif
-#ifdef HAVE_GD_XPM
+#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
 	ret |= 16;
 #endif
 	if (ZEND_NUM_ARGS() != 0) {