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

required engine stuff
- Fix build

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
   

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);