summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-07-15 14:44:53 +0000
committerIgor Sysoev <igor@sysoev.ru>2007-07-15 14:44:53 +0000
commitae004c059255a6bf60862b436be1f0c5bd43cfff (patch)
tree8c77caa7d7b4c86539a7827626c497e35cd937df
parent8662b6bec54b138572c50d3e1fb738790ef3eb5c (diff)
downloadnginx-ae004c059255a6bf60862b436be1f0c5bd43cfff.tar.gz
nginx-ae004c059255a6bf60862b436be1f0c5bd43cfff.tar.bz2
icc/sunc and PCRE-7.1+ compatibility
-rw-r--r--auto/lib/pcre/conf7
1 files changed, 6 insertions, 1 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 3b2ca1248..f0666ae71 100644
--- a/auto/lib/pcre/conf
+++ b/auto/lib/pcre/conf
@@ -29,9 +29,14 @@ if [ $PCRE != NONE ]; then
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"