diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-12-04 18:01:53 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-12-04 18:01:53 +0000 |
| commit | 44a3cad930f61b672b0a8758f9e2df1b1d610a47 (patch) | |
| tree | 25e39cb0e31ee957492916ad3f7d967b03b047e1 | |
| parent | 8e907392b3dbd3eef600aa590781aae295902f1a (diff) | |
| download | php-git-44a3cad930f61b672b0a8758f9e2df1b1d610a47.tar.gz | |
MFH: partly fix #39724
ext/spl has a soft dependcy from ext/pcre (not ext/pcre-regex)
| -rw-r--r-- | ext/pcre/config0.m4 | 4 | ||||
| -rwxr-xr-x | ext/spl/config.m4 | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 323d9aefa1..e762327d00 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -52,6 +52,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then 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 diff --git a/ext/spl/config.m4 b/ext/spl/config.m4 index fc11a09e5f..9d4b2b5f4f 100755 --- a/ext/spl/config.m4 +++ b/ext/spl/config.m4 @@ -28,4 +28,5 @@ int main(int argc, char **argv) { 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 |