From ae004c059255a6bf60862b436be1f0c5bd43cfff Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sun, 15 Jul 2007 14:44:53 +0000 Subject: [PATCH] icc/sunc and PCRE-7.1+ compatibility --- auto/lib/pcre/conf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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"