diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-07-22 08:47:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-07-22 08:47:45 +0000 |
| commit | 64bb1e34d24f805a278da05e55efd449be76e57f (patch) | |
| tree | bf4555e728d672cf86c58f163eb7e1e8f3b0bdb1 /auto/lib | |
| parent | fbd3b2d727af9cc308d0a0c82812d5181f9a477e (diff) | |
| download | nginx-64bb1e34d24f805a278da05e55efd449be76e57f.tar.gz nginx-64bb1e34d24f805a278da05e55efd449be76e57f.tar.bz2 | |
r1306, r1307, r1308, r1309, r1310, r1311, r1322, r1325 merge:
Sun Studio related fixes
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/pcre/conf | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/auto/lib/pcre/conf b/auto/lib/pcre/conf index 3b2ca1248..3789ad14b 100644 --- a/auto/lib/pcre/conf +++ b/auto/lib/pcre/conf @@ -17,7 +17,7 @@ if [ $PCRE != NONE ]; then CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" ;; - icc* | sunc ) + icc* ) have=NGX_PCRE . auto/have CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" @@ -25,13 +25,18 @@ if [ $PCRE != NONE ]; then echo $ngx_n "checking for PCRE library ...$ngx_c" - if [ -e $PCRE/pcre.h ]; then + if [ -f $PCRE/pcre.h ]; then ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \ | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'` - else + else if [ -f $PCRE/configure.in ]; 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" |