diff options
Diffstat (limited to 'ext/filter/config.m4')
| -rw-r--r-- | ext/filter/config.m4 | 54 |
1 files changed, 3 insertions, 51 deletions
diff --git a/ext/filter/config.m4 b/ext/filter/config.m4 index b7a42cf10..0de6fb5df 100644 --- a/ext/filter/config.m4 +++ b/ext/filter/config.m4 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.6 2006/01/14 15:04:12 sniper Exp $ +dnl $Id: config.m4,v 1.6.2.3 2006/12/05 23:51:30 tony2001 Exp $ dnl config.m4 for input filtering extension PHP_ARG_ENABLE(filter, whether to enable input filter support, @@ -39,57 +39,9 @@ yes CPPFLAGS=$old_CPPFLAGS 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) - 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_srcdir/php_filter.h]) + PHP_INSTALL_HEADERS([ext/filter/php_filter.h]) + PHP_ADD_EXTENSION_DEP(filter, pcre) fi |