cvs: php4(PHP_4_3) /ext/gd config.m4 gd.c

moriyoshi Sat Apr 19 03:45:45 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gd config.m4 gd.c Log: MFH(r-1.135, r-1.268): made phpinfo() / gd_info() indicate availability of JIS feature Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.120.2.12 php4/ext/gd/config.m4:1.120.2.13 --- php4/ext/gd/config.m4:1.120.2.12 Sat Apr 19 03:16:06 2003 +++ php4/ext/gd/config.m4 Sat Apr 19 03:45:45 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.120.2.12 2003/04/19 07:16:06 moriyoshi Exp $ +dnl $Id: config.m4,v 1.120.2.13 2003/04/19 07:45:45 moriyoshi Exp $ dnl dnl @@ -230,7 +230,7 @@ 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 @@ fi if test -n "$USE_GD_JIS_CONV"; then + AC_DEFINE(USE_GD_JISX0208, 1, [ ]) GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi Index: php4/ext/gd/gd.c diff -u php4/ext/gd/gd.c:1.221.2.24 php4/ext/gd/gd.c:1.221.2.25 --- php4/ext/gd/gd.c:1.221.2.24 Sat Apr 5 15:49:09 2003 +++ php4/ext/gd/gd.c Sat Apr 19 03:45:45 2003 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: gd.c,v 1.221.2.24 2003/04/05 20:49:09 helly Exp $ */ +/* $Id: gd.c,v 1.221.2.25 2003/04/19 07:45:45 moriyoshi Exp $ */ /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center, Cold Spring Harbor Labs. */ @@ -443,6 +443,9 @@ #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(); } /* }}} */ @@ -507,6 +510,11 @@ add_assoc_bool(return_value, "XBM Support", 1); #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 } /* }}} */