cvs: php-src /ext/filter config.m4

iliaa Tue Dec 5 23:38:10 2006 UTC Modified files: /php-src/ext/filter config.m4 Log: MFB: Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension). http://cvs.php.net/viewvc.cgi/php-src/ext/filter/config.m4?r1=1.7&r2=1.8&diff_format=u Index: php-src/ext/filter/config.m4 diff -u php-src/ext/filter/config.m4:1.7 php-src/ext/filter/config.m4:1.8 --- php-src/ext/filter/config.m4:1.7 Fri Nov 3 20:08:54 2006 +++ php-src/ext/filter/config.m4 Tue Dec 5 23:38:10 2006 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.7 2006/11/03 20:08:54 iliaa Exp $ +dnl $Id: config.m4,v 1.8 2006/12/05 23:38:10 iliaa Exp $ dnl config.m4 for input filtering extension PHP_ARG_ENABLE(filter, whether to enable input filter support, @@ -40,56 +40,12 @@ 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