tsukada
ttsuk****@users*****
2003年 2月 11日 (火) 22:52:35 JST
ttsukada 03/02/11 22:52:35
Modified: ext/mbstring config.m4
Log:
merge
Revision Changes Path
1.9 +11 -13 php4/ext/mbstring/config.m4
Index: config.m4
===================================================================
RCS file: /cvsroot/php-i18n/php4/ext/mbstring/config.m4,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- config.m4 6 Oct 2002 20:58:00 -0000 1.8
+++ config.m4 11 Feb 2003 13:52:35 -0000 1.9
@@ -2,14 +2,8 @@
dnl $Id: config.m4,v 1.10 2002/05/04 16:50:10 sas Exp $
dnl
-PHP_ARG_ENABLE(mbstr_enc_trans, whether to enable encoding translation,
-[ --enable-mbstr-enc-trans Enable encoding translation], yes)
-
-PHP_ARG_ENABLE(mbregex, whether to enable multibyte regex support,
-[ --enable-mbregex Enable multibyte regex support], yes)
-
-PHP_ARG_WITH(mbstring, whether to enable multibyte string support,
-[ --disable-mbstring Disable multibyte string support], yes)
+PHP_ARG_ENABLE(mbstring, whether to enable multibyte string support,
+[ --enable-mbstring Enable multibyte string support])
if test "$PHP_MBSTRING" != "no"; then
AC_DEFINE(HAVE_MBSTRING,1,[whether to have multibyte string support])
@@ -26,26 +20,30 @@
if test "$PHP_MBSTRING" = "kr"; then
AC_DEFINE(HAVE_MBSTR_KR,1,[whether to have korean support])
fi
+ if test "$PHP_MBSTRING" = "ru"; then
+ AC_DEFINE(HAVE_MBSTR_RU,1,[whether to have russian support])
+ fi
if test "$PHP_MBSTRING" = "all"; then
AC_DEFINE(HAVE_MBSTR_JA,1,[whether to have japanese support])
AC_DEFINE(HAVE_MBSTR_CN,1,[whether to have simplified chinese support])
AC_DEFINE(HAVE_MBSTR_TW,1,[whether to have traditional chinese support])
AC_DEFINE(HAVE_MBSTR_KR,1,[whether to have korean support])
+ AC_DEFINE(HAVE_MBSTR_RU,1,[whether to have russian support])
fi
+
PHP_NEW_EXTENSION(mbstring, mbfl/character.c mbfl/codeset.c mbfl/filter.c \
mbfl/filter_ucs.c mbfl/filter_mime.c mbfl/filter_8859.c mbfl/filter_ja.c \
encoding.c language.c buffer.c string.c filter.c mbfunction.c \
mbfilter_cn.c mbfilter_kr.c mbfilter_tw.c mbstring.c mbregex.c \
- php_mbregex.c post.c casefold.c, $ext_shared)
+ php_mbregex.c mb_gpc.c casefold.c, $ext_shared)
PHP_ADD_INCLUDE($ext_srcdir/mbfl)
else
PHP_MBSTR_ENC_TRANS=no
fi
-if test "$PHP_MBSTR_ENC_TRANS" != "no" ; then
- AC_DEFINE(MBSTR_ENC_TRANS, 1, [whether to have encoding translation])
-fi
+PHP_ARG_ENABLE(mbregex, whether to enable multibyte regex support,
+[ --disable-mbregex Disable multibyte regex support], yes, no)
-if test "$MBREGEX" != "no" ; then
+if test "$PHP_MBREGEX" != "no" -a "$PHP_MBSTRING" != "no"; then
AC_DEFINE(HAVE_MBREGEX, 1, [whether to have multibyte regex support])
fi