helly Thu Feb 23 20:15:36 2006 UTC
Modified files:
/php-src/ext/mbstring config.m4 mbstring.c
Log:
- Disable mbregex support until someone finds a way to reenable the
required engine stuff
- Fix build
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/config.m4?r1=1.60&r2=1.61&diff_format=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.60 php-src/ext/mbstring/config.m4:1.61
--- php-src/ext/mbstring/config.m4:1.60 Fri Dec 23 13:50:29 2005
+++ php-src/ext/mbstring/config.m4 Thu Feb 23 20:15:36 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.60 2005/12/23 13:50:29 hirokawa Exp $
+dnl $Id: config.m4,v 1.61 2006/02/23 20:15:36 helly Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -271,10 +271,12 @@
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
http://cvs.php.net/viewcvs.cgi/php-src/ext/mbstring/mbstring.c?r1=1.237&r2=1.238&diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.237
php-src/ext/mbstring/mbstring.c:1.238
--- php-src/ext/mbstring/mbstring.c:1.237 Sat Feb 11 02:25:29 2006
+++ php-src/ext/mbstring/mbstring.c Thu Feb 23 20:15:36 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.237 2006/02/11 02:25:29 hirokawa Exp $ */
+/* $Id: mbstring.c,v 1.238 2006/02/23 20:15:36 helly Exp $ */
/*
* PHP 4 Multibyte String module "mbstring"
@@ -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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
