diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-12-05 23:37:57 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-12-05 23:37:57 +0000 |
| commit | 62cd5a9bae818df32b4f6c832a6e8ea37261b486 (patch) | |
| tree | 5145164326d3119c658cd26f4bb147c0681cc35c /ext | |
| parent | 9ce985bbae97b8bb6850577c155b31b3a966a770 (diff) | |
| download | php-git-62cd5a9bae818df32b4f6c832a6e8ea37261b486.tar.gz | |
Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/filter/config.m4 | 48 |
1 files changed, 2 insertions, 46 deletions
diff --git a/ext/filter/config.m4 b/ext/filter/config.m4 index b125c7e20c..8587cbd2af 100644 --- 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 |