@- Enabled mbregex by default when mbstring is also enabled (Moriyoshi)

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index 35141ecfecbec8836fd782bd8bd6ba80be4f6758..af99d893e1bbee651a0c4631859aea6ff9669fc5 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -34,10 +34,9 @@ if test "$PHP_MBSTRING" != "no"; then
   PHP_NEW_EXTENSION(mbstring, mbfilter_ja.c mbfilter_cn.c mbfilter_tw.c mbfilter_kr.c mbfilter_ru.c mbfilter.c mbstring.c mbregex.c php_mbregex.c html_entities.c php_unicode.c mb_gpc.c, $ext_shared)
 fi
 
-
 PHP_ARG_ENABLE(mbregex, whether to enable multibyte regex support,
-[  --enable-mbregex        Enable multibyte regex support], no, no)
+[  --disable-mbregex       Disable multibyte regex support], yes, no)
 
-if test "$PHP_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