From: Marcus Boerger <helly@php.net>
Date: Thu, 23 Feb 2006 20:15:36 +0000 (+0000)
Subject: - Disable mbregex support until someone finds a way to reenable the
X-Git-Tag: RELEASE_1_2~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bb94742080dff0adfa8c257116e7a5c69b852c6a;p=php

- 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 d2c7383e91..992f0ae7df 100644
--- 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 fa11966112..980de28440 100644
--- 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);