- Disable mbregex support until someone finds a way to reenable the

  required engine stuff
- Fix build

diff --git a/ext/mbstring/config.m4 b/ext/mbstring/config.m4
index d2c7383e9176b5b3544dcdc199d346e6629543af..992f0ae7dfa9be95651b580a8c46f2e5ee65ee1f 100644 (file)
--- a/ext/mbstring/config.m4
+++ b/ext/mbstring/config.m4
@@ -271,10 +271,12 @@ PHP_ARG_WITH(libmbfl, [for external libmbfl],
 
 if test "$PHP_MBSTRING" != "no"; then  
   AC_DEFINE([HAVE_MBSTRING],1,[whether to have multibyte string support])
+  AC_DEFINE([HAVE_MBREGEX], 0,[whether to have multibyte regex support])
 
   PHP_MBSTRING_ADD_BASE_SOURCES([mbstring.c php_unicode.c mb_gpc.c])
 
   if test "$PHP_MBREGEX" != "no"; then
+    AC_MSG_ERROR([multibyte regex support must be disabled, use --disable-mbregex])
     PHP_MBSTRING_SETUP_MBREGEX
   fi
   

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index fa119661122d125a6ef4287c39e7b7f0ce98f35a..980de284407702724720f66c74427951c2031418 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -79,6 +79,8 @@
 #if HAVE_MBSTRING
 /* }}} */
 
+#include "oniguruma/oniguruma.h"
+
 /* {{{ prototypes */
 static void _php_mb_globals_ctor(zend_mbstring_globals *pglobals TSRMLS_DC);
 static void _php_mb_globals_dtor(zend_mbstring_globals *pglobals TSRMLS_DC);