com php-src: Remove the PCRE checks from ext/filter. pecl/filter is obsolete and since PCRE is a hard dependency for PHP, it will always be
available.: ext/filter/config.m4

From: Date: Tue, 19 Mar 2019 04:50:02 +0000
Subject: com php-src: Remove the PCRE checks from ext/filter. pecl/filter is obsolete and since PCRE is a hard dependency for PHP, it will always be
available.: ext/filter/config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105230@lists.php.net to get a copy of this message
Commit: d63b442778d1069335892cc957d9bf79d214adf7 Author: Kalle Sommer Nielsen <kalle@php.net> Tue, 19 Mar 2019 06:50:02 +0200 Parents: 61548042f785bab84059f19a1e9d7dc2e5d206a7 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d63b442778d1069335892cc957d9bf79d214adf7 Log: Remove the PCRE checks from ext/filter. pecl/filter is obsolete and since PCRE is a hard dependency for PHP, it will always be available. A side effect of this should be that Unix builds now support shared builds using ./configure Changed paths: M ext/filter/config.m4 Diff: diff --git a/ext/filter/config.m4 b/ext/filter/config.m4 index 55f382e..8c09bee 100644 --- a/ext/filter/config.m4 +++ b/ext/filter/config.m4 @@ -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)

« previous php.cvs (#105230) next »