cvs: php-src(PHP_5_2) /ext/pcre config0.m4 /ext/spl config.m4

tony2001 Mon Dec 4 18:01:53 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/spl config.m4 /php-src/ext/pcre config0.m4 Log: MFH: partly fix #39724 ext/spl has a soft dependcy from ext/pcre (not ext/pcre-regex) http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.m4?r1=1.13.2.4.2.2&r2=1.13.2.4.2.3&diff_format=u Index: php-src/ext/spl/config.m4 diff -u php-src/ext/spl/config.m4:1.13.2.4.2.2 php-src/ext/spl/config.m4:1.13.2.4.2.3 --- php-src/ext/spl/config.m4:1.13.2.4.2.2 Sun Nov 12 19:00:33 2006 +++ php-src/ext/spl/config.m4 Mon Dec 4 18:01:53 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.13.2.4.2.2 2006/11/12 19:00:33 bjori Exp $ +dnl $Id: config.m4,v 1.13.2.4.2.3 2006/12/04 18:01:53 tony2001 Exp $ dnl config.m4 for extension SPL PHP_ARG_ENABLE(spl, enable SPL suppport, @@ -28,4 +28,5 @@ AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no) PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h]) + PHP_ADD_EXTENSION_DEP(spl, pcre, true) fi http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.3&r2=1.38.2.3.2.4&diff_format=u Index: php-src/ext/pcre/config0.m4 diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.3 php-src/ext/pcre/config0.m4:1.38.2.3.2.4 --- php-src/ext/pcre/config0.m4:1.38.2.3.2.3 Wed Aug 30 20:00:21 2006 +++ php-src/ext/pcre/config0.m4 Mon Dec 4 18:01:53 2006 @@ -1,5 +1,5 @@ dnl -dnl $Id: config0.m4,v 1.38.2.3.2.3 2006/08/30 20:00:21 iliaa Exp $ +dnl $Id: config0.m4,v 1.38.2.3.2.4 2006/12/04 18:01:53 tony2001 Exp $ dnl dnl By default we'll compile and link against the bundled PCRE library @@ -52,6 +52,8 @@ AC_DEFINE(HAVE_PCRE, 1, [ ]) PHP_ADD_INCLUDE($PCRE_INCDIR) PHP_NEW_EXTENSION(pcre, 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 -DMAX_NAME_SIZE=32 -DMAX_NAME_COUNT=10000 -DMAX_DUPLENGTH=30000) + PHP_SUBST(PCRE_SHARED_LIBADD) fi - PHP_SUBST(PCRE_SHARED_LIBADD) +else + PHP_PCRE=no fi