Sync the changes to ext/filter with 7.4, now that it works.

- Removed --with-pcre-dir
- The filter extension can now be built as shared on Unix with ./configure

4 files changed, 13 insertions, 39 deletions

diff --git a/NEWS b/NEWS
index d88c458808..b4e5db0a24 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,11 @@ PHP                                                                        NEWS
 - FFI:
   . Added FFI extension. (Dmitry)
 
+- Filter:
+  . The filter extension no longer have the --with-pcre-dir on Unix builds, 
+    allowing the extension to be once more compiled as shared using 
+    ./configure. (Kalle)
+
 - FPM:
   . Implemented FR #72510 (systemd service should be hardened). (Craig Andrews)
 
diff --git a/UPGRADING b/UPGRADING
index cc9507c50f..d8dfe2b8a5 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -251,6 +251,10 @@ PHP 7.4 UPGRADE NOTES
   . imagescale() now supports aspect ratio preserving scaling to a fixed height
     by passing -1 as $new_width.
 
+- Filter:
+  . The filter extension no longer exposes --with-pcre-dir for Unix builds and 
+    can now reliably be built as shared when using ./configure once more.
+
 - Hash:
   . The hash extension cannot be disabled anymore and is always an integral
     part of any PHP build, similar to the date extension.
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 8efdb9c5a3..626c71e663 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -190,7 +190,10 @@ PHP 7.4 INTERNALS UPGRADE NOTES
 
   a. Abstract
     - The hash extension is now always available, meaning the --enable-hash
-	  configure argument has been removed.
+	    configure argument has been removed.
+    - The filter extension no longer exposes the --with-pcre-dir configure 
+      argument and therefore allows shared builds with ./configure for Unix 
+      builds.
 
   b. Unix build system changes
     - configure --help now also outputs --program-suffix and --program-prefix
diff --git a/ext/filter/config.m4 b/ext/filter/config.m4
index 55f382eb21..06ca873f6f 100644
--- a/ext/filter/config.m4
+++ b/ext/filter/config.m4
@@ -6,45 +6,7 @@ PHP_ARG_ENABLE([filter],
     [Disable input filter support])],
   [yes])
 
-PHP_ARG_WITH([pcre-dir],
-  [pcre install prefix],
-  [AS_HELP_STRING([--with-pcre-dir],
-    [FILTER: pcre install prefix])],
-  [no],
-  [no])
-
 if test "$PHP_FILTER" != "no"; then
-
-  dnl Check if configure is the PHP core configure
-  if test -n "$PHP_VERSION"; then
-    dnl This extension can not be build as shared when in PHP core
-    ext_shared=no
-  else
-    dnl This is PECL build, check if bundled PCRE library is used
-    old_CPPFLAGS=$CPPFLAGS
-    CPPFLAGS=$INCLUDES
-    AC_EGREP_CPP(yes,[
-#include <main/php_config.h>
-#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
-yes
-#endif
-    ],[
-      PHP_PCRE_REGEX=yes
-    ],[
-      AC_EGREP_CPP(yes,[
-#include <main/php_config.h>
-#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
-yes
-#endif
-      ],[
-        PHP_PCRE_REGEX=pecl
-      ],[
-        PHP_PCRE_REGEX=no
-      ])
-    ])
-    CPPFLAGS=$old_CPPFLAGS
-  fi
-
   PHP_NEW_EXTENSION(filter, filter.c sanitizing_filters.c logical_filters.c callback_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(FILTER_SHARED_LIBADD)