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

hirokawa Sat Apr 19 00:13:01 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/gd config.m4 Log: added an option to support japanese encoding conversion in bundled gd. Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.120.2.10 php4/ext/gd/config.m4:1.120.2.11 --- php4/ext/gd/config.m4:1.120.2.10 Mon Mar 17 21:14:22 2003 +++ php4/ext/gd/config.m4 Sat Apr 19 00:13:01 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.120.2.10 2003/03/18 02:14:22 sniper Exp $ +dnl $Id: config.m4,v 1.120.2.11 2003/04/19 04:13:01 hirokawa Exp $ dnl dnl @@ -40,6 +40,9 @@ PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD, [ --enable-gd-native-ttf GD: Enable TrueType string function.], no, no) +PHP_ARG_ENABLE(gd-jis-conv, whether to enable japanese encoding conversion in GD, +[ --enable-gd-jis-conv GD: Enable Japanese encoding conversion.], no, no) + dnl dnl Checks for the configure options dnl @@ -225,6 +228,12 @@ fi ]) +AC_DEFUN(PHP_GD_JISX0208,[ + if test "$PHP_GD_JIS_CONV" = "yes"; then + USE_GD_JIS_CONV=1 + fi +]) + AC_DEFUN(PHP_GD_CHECK_VERSION,[ PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) @@ -269,6 +278,7 @@ dnl Various checks for GD features PHP_GD_TTSTR + PHP_GD_JISX0208 PHP_GD_JPEG PHP_GD_PNG PHP_GD_XPM @@ -317,6 +327,10 @@ if test -n "$TTF_DIR"; then GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBTTF" + fi + + if test -n "$USE_GD_JIS_CONV"; then + GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" fi else