nlopess Wed Jun 14 16:26:22 2006 UTC
Removed files: (Branch: PHP_5_2)
/php-src/ext/pcre/pcrelib pcre_dfa_exec.c
Modified files:
/php-src/ext/pcre config.w32 config0.m4
Log:
remove the pcre_dfa_exec.c file, as it is needed (we dont expose that API)
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.1&r2=1.4.2.5.2.2&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.1
php-src/ext/pcre/config.w32:1.4.2.5.2.2
--- php-src/ext/pcre/config.w32:1.4.2.5.2.1 Thu May 18 21:50:51 2006
+++ php-src/ext/pcre/config.w32 Wed Jun 14 16:26:22 2006
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.5.2.1 2006/05/18 21:50:51 edink Exp $
+// $Id: config.w32,v 1.4.2.5.2.2 2006/06/14 16:26:22 nlopess Exp $
// vim:ft=javascript
ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
@@ -6,7 +6,7 @@
if (PHP_PCRE_REGEX == "yes") {
EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
"-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000
-DMATCH_LIMIT_RECURSION=10000000 -DNO_RECURSE -Iext/pcre/pcrelib");
- ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_dfa_exec.c pcre_exec.c
pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c
pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c
pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
+ ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c
pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c
pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_ord2utf8.c
pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c
pcre_version.c pcre_xclass.c", "pcre");
ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
http://cvs.php.net/viewcvs.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.1&r2=1.38.2.3.2.2&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.1
php-src/ext/pcre/config0.m4:1.38.2.3.2.2
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.1 Sun May 28 15:33:56 2006
+++ php-src/ext/pcre/config0.m4 Wed Jun 14 16:26:22 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.1 2006/05/28 15:33:56 iliaa Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.2 2006/06/14 16:26:22 nlopess Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -13,7 +13,7 @@
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
- PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_dfa_exec.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c
pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c
pcrelib/pcre_maketables.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,-DEXPORT= -DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP
-DLINK_SIZE=2 -DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000
-DMATCH_LIMIT_RECURSION=10000000 [EMAIL PROTECTED]@/pcrelib)
+ PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c
pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c
pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-DEXPORT=
-DNEWLINE=10 -DSUPPORT_UTF8 -DSUPPORT_UCP -DLINK_SIZE=2
-DPOSIX_MALLOC_THRESHOLD=10 -DMATCH_LIMIT=10000000
-DMATCH_LIMIT_RECURSION=10000000 [EMAIL PROTECTED]@/pcrelib)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
