partly fix #39724

ext/spl has a soft dependcy from ext/pcre (not ext/pcre-regex)

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 14c5953f19492b0321bea798716299d4a9c9457a..98ecd328905caca310dbef230bd57c5ed3481515 100644 (file)
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -53,6 +53,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 4458f59c5de0b6b889a317239b8ea178644a704e..0a54c5db5ca055a7dcc29a602f5e3754b50d3970 100755 (executable)
--- a/ext/spl/config.m4
+++ b/ext/spl/config.m4
@@ -31,4 +31,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