# HG changeset patch # User Igor Sysoev # Date 1184510693 0 # Node ID 1476d32c66a7dc5c9fdc129548f885b5ecb08781 # Parent 458e041fc90285a58dc17f7d871988e2eeba8d75 icc/sunc and PCRE-7.1+ compatibility diff -r 458e041fc902 -r 1476d32c66a7 auto/lib/pcre/conf --- a/auto/lib/pcre/conf Fri Jul 13 09:37:01 2007 +0000 +++ b/auto/lib/pcre/conf Sun Jul 15 14:44:53 2007 +0000 @@ -29,9 +29,14 @@ ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \ | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'` - else + else if [ -e $PCRE/configure.in.h ]; then ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ | sed -e 's/^.*=\(.*\)$/\1/'` + + else + ngx_pcre_ver=`grep pcre_major, $PCRE/configure.ac \ + | sed -e 's/^.*pcre_major,.*\[\(.*\)\].*$/\1/'` + fi fi echo " $ngx_pcre_ver major version found"