Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).

diff --git a/NEWS b/NEWS
index 8ea2a5298d8068de9fda95220de1fec22969ec7d..bd409009fdcae9bfb83382a3741d54bd509b5734 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -48,6 +48,8 @@ PHP                                                                        NEWS
   . Invalid filters fails instead of returning unsafe value
 - Fixed wrong signature initialization in imagepng (Takeshi Abe)
 - Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).
+  (Tony, Ilia)
 - Fixed bug #39718 (possible crash if assert.callback is set in ini). (Ilia)
 - Fixed bug #39702 (php crashes in the allocator on linux-m68k). (Dmitry)
 - Fixed bug #39673 (file_get_contents causes bus error on certain offsets). 

diff --git a/ext/filter/config.m4 b/ext/filter/config.m4
index b125c7e20c091a975978e94a47ba1a49084c09bf..8587cbd2afc34c0b0b22e79182375bd0796291c6 100644 (file)
--- a/ext/filter/config.m4
+++ b/ext/filter/config.m4
@@ -40,56 +40,12 @@ yes
   fi
 
   if test "$PHP_PCRE_REGEX" != "yes"; then
-    dnl
-    dnl If PCRE extension is enabled we can use the already found paths,
-    dnl otherwise we have to detect them here:
-    dnl
-    if test "$PHP_PCRE_REGEX" = "no" || test "$PHP_PCRE_REGEX" = "pecl"; then
-      dnl Set the PCRE search dirs correctly
-      case "$PHP_PCRE_DIR" in
-        yes|no)
-          PCRE_SEARCH_DIR="/usr/local /usr"
-          ;;
-        *)
-          PCRE_SEARCH_DIR="$PHP_PCRE_DIR"
-          ;;
-      esac
-
-      for i in $PCRE_SEARCH_DIR; do
-        if test -f $i/include/pcre/pcre.h; then
-          PCRE_INCDIR=$i/include/pcre
-          break
-        elif test -f $i/include/pcre.h; then
-          PCRE_INCDIR=$i/include
-          break
-        elif test -f $i/pcre.h; then
-          PCRE_INCDIR=$i
-          break
-        fi
-      done
-
-      if test -z "$PCRE_INCDIR"; then
-        AC_MSG_ERROR([Could not find pcre.h anywhere under $PCRE_SEARCH_DIR])
-      fi
-
-      for j in $PCRE_SEARCH_DIR/$PHP_LIBDIR $PCRE_SEARCH_DIR; do
-        if test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME; then
-          PCRE_LIBDIR=$j
-          break
-        fi
-      done
-    
-      if test -z "$PCRE_LIBDIR" ; then
-        AC_MSG_ERROR([Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) anywhere under $PCRE_SEARCH_DIR])
-      fi
-    fi
-
-    PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, FILTER_SHARED_LIBADD)
-    PHP_ADD_INCLUDE($PCRE_INCDIR)
+    AC_MSG_ERROR([Could not compile filter extension against PHP without pcre support])
   fi
 
   PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared)
   PHP_SUBST(FILTER_SHARED_LIBADD)
 
   PHP_INSTALL_HEADERS([ext/filter/php_filter.h])
+  PHP_ADD_EXTENSION_DEP(filter, pcre, true)
 fi