]> granicus.if.org Git - php/commitdiff
Remove the PCRE checks from ext/filter. pecl/filter is obsolete and since PCRE is...
authorKalle Sommer Nielsen <kalle@php.net>
Tue, 19 Mar 2019 04:50:02 +0000 (06:50 +0200)
committerKalle Sommer Nielsen <kalle@php.net>
Tue, 19 Mar 2019 04:50:02 +0000 (06:50 +0200)
A side effect of this should be that Unix builds now support shared builds using ./configure

ext/filter/config.m4

index 55f382eb213875d723d3a22fa3bb699e8003850d..8c09bee5eb68e797c83361b397a32a10f81f7a9d 100644 (file)
@@ -14,37 +14,6 @@ PHP_ARG_WITH([pcre-dir],
   [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)