diff options
| author | Andrey Hristov <andrey@php.net> | 1999-09-14 19:24:37 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 1999-09-14 19:24:37 +0000 |
| commit | 870a6679ff21e52753e47614b85d300c2f55b211 (patch) | |
| tree | bd21962430d1328d82a586fc3bc3cd97a9944733 /ext/pcre/config.m4 | |
| parent | 61a3c147c3e8a8db79219a5c225db6bca30220a5 (diff) | |
| download | php-git-870a6679ff21e52753e47614b85d300c2f55b211.tar.gz | |
- Updated bundled PCRE library to version 2.08
- Made it possible to specify external location of the PCRE library
- Reworked PCRE extension to use updated PCRE library API
Hopefully now everything behaves just like Perl..
Diffstat (limited to 'ext/pcre/config.m4')
| -rw-r--r-- | ext/pcre/config.m4 | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4 index eef4563d31..6137e59269 100644 --- a/ext/pcre/config.m4 +++ b/ext/pcre/config.m4 @@ -6,20 +6,51 @@ dnl if DIR is supplied, we'll use that for linking AC_MSG_CHECKING(whether to include PCRE support) AC_ARG_WITH(pcre-regex, -[ --without-pcre-regex Don't include Perl Compatible Regular Expressions support],[ - if test "$withval" = "yes"; then - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - else - AC_MSG_RESULT(no) - fi +[ --without-pcre-regex Don't include Perl Compatible Regular Expressions support + Use --with-pcre-regex=DIR to specify DIR where PCRE include + and library files are located],[ + case "$withval" in + no) + AC_MSG_RESULT(no) + ;; + yes) + EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" + PCRE_SUBDIR="pcrelib" + AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_MSG_RESULT(yes) + PHP_EXTENSION(pcre) + ;; + *) + if test -f $withval/pcre.h ; then + changequote({,}) + pcre_major=`grep PCRE_MAJOR $withval/pcre.h | sed -e 's/[^0-9]//g'` + pcre_minor=`grep PCRE_MINOR $withval/pcre.h | sed -e 's/[^0-9]//g'` + changequote([,]) + pcre_version=$pcre_major$pcre_minor + if test "$pcre_version" -ge 208; then + AC_ADD_INCLUDE($withval) + else + AC_MSG_ERROR(PCRE extension requires PCRE library version >= 2.08) + fi + else + AC_MSG_ERROR(Could not find pcre.h in $withval) + fi + + if test -f $withval/libpcre.a ; then + AC_ADD_LIBRARY_WITH_PATH(pcre, $withval) + else + AC_MSG_ERROR(Could not find libpcre.a in $withval) + fi + + AC_DEFINE(HAVE_PCRE, 1) + AC_MSG_RESULT(yes) + PHP_EXTENSION(pcre) + ;; + esac ],[ EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) ]) |