From c629ac46002af056e36817c1dd6030740f508454 Mon Sep 17 00:00:00 2001
From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sat, 19 Apr 2003 07:45:45 +0000
Subject: [PATCH] MFH(r-1.135, r-1.268): made phpinfo() / gd_info() indicate
 availability of JIS feature

---
 ext/gd/config.m4 | 3 ++-
 ext/gd/gd.c      | 8 ++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 7d5f2c76ce..c04a10fa08 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -230,7 +230,7 @@ AC_DEFUN(PHP_GD_TTSTR,[
 
 AC_DEFUN(PHP_GD_JISX0208,[
   if test "$PHP_GD_JIS_CONV" = "yes"; then
-   USE_GD_JIS_CONV=1
+    USE_GD_JIS_CONV=1
   fi
 ])
 
@@ -330,6 +330,7 @@ dnl enable the support in bundled GD library
   fi
 
   if test -n "$USE_GD_JIS_CONV"; then
+    AC_DEFINE(USE_GD_JISX0208, 1, [ ])
     GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
   fi
 
diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index f4ac03e253..4491dc1487 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -442,6 +442,9 @@ PHP_MINFO_FUNCTION(gd)
 #endif
 #ifdef HAVE_GD_XBM
 	php_info_print_table_row(2, "XBM Support", "enabled");
+#endif
+#if defined(USE_GD_JISX0208) && defined(HAVE_GD_BUNDLED)
+	php_info_print_table_row(2, "JIS-mapped Japanese Font Support", "enabled");
 #endif
 	php_info_print_table_end();
 }
@@ -508,6 +511,11 @@ PHP_FUNCTION(gd_info)
 #else
 	add_assoc_bool(return_value, "XBM Support", 0);
 #endif
+#if defined(USE_GD_JISX0208) && defined(HAVE_GD_BUNDLED)
+	add_assoc_bool(return_value, "JIS-mapped Japanese Font Support", 1);
+#else
+	add_assoc_bool(return_value, "JIS-mapped Japanese Font Support", 0);
+#endif
 }
 /* }}} */
 
-- 
2.40.0