icc/sunc and PCRE-7.1+ compatibility

diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf
index 3b2ca124838aa0567ab5ca94ce2928dcdcf1084e..f0666ae719fcdce62092bd1c3222f78704f5a2fd 100644 (file)
--- 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"