Mercurial > hg > nginx

changeset 1305:1476d32c66a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
icc/sunc and PCRE-7.1+ compatibility
author Igor Sysoev <igor@sysoev.ru>
date Sun, 15 Jul 2007 14:44:53 +0000
parents 458e041fc902
children 56af40ef3a08
files auto/lib/pcre/conf
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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"