Mercurial > hg > nginx
comparison auto/lib/pcre/conf @ 1327:b766d9c0a2be stable-0.5
r1306, r1307, r1308, r1309, r1310, r1311, r1322, r1325 merge:
Sun Studio related fixes
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 22 Jul 2007 08:47:45 +0000 |
parents | c7850d8b5239 |
children | 7bdf156fc852 |
comparison
equal
deleted
inserted
replaced
1326:ccd8734e4a80 | 1327:b766d9c0a2be |
---|---|
15 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" | 15 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
16 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" | 16 LINK_DEPS="$LINK_DEPS $PCRE/pcre.lib" |
17 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" | 17 CORE_LIBS="$CORE_LIBS $PCRE/pcre.lib" |
18 ;; | 18 ;; |
19 | 19 |
20 icc* | sunc ) | 20 icc* ) |
21 have=NGX_PCRE . auto/have | 21 have=NGX_PCRE . auto/have |
22 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" | 22 CORE_DEPS="$CORE_DEPS $PCRE/pcre.h" |
23 | 23 |
24 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" | 24 LINK_DEPS="$LINK_DEPS $PCRE/.libs/libpcre.a" |
25 | 25 |
26 echo $ngx_n "checking for PCRE library ...$ngx_c" | 26 echo $ngx_n "checking for PCRE library ...$ngx_c" |
27 | 27 |
28 if [ -e $PCRE/pcre.h ]; then | 28 if [ -f $PCRE/pcre.h ]; then |
29 ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \ | 29 ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \ |
30 | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'` | 30 | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'` |
31 | 31 |
32 else | 32 else if [ -f $PCRE/configure.in ]; then |
33 ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ | 33 ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ |
34 | sed -e 's/^.*=\(.*\)$/\1/'` | 34 | sed -e 's/^.*=\(.*\)$/\1/'` |
35 | |
36 else | |
37 ngx_pcre_ver=`grep pcre_major, $PCRE/configure.ac \ | |
38 | sed -e 's/^.*pcre_major,.*\[\(.*\)\].*$/\1/'` | |
39 fi | |
35 fi | 40 fi |
36 | 41 |
37 echo " $ngx_pcre_ver major version found" | 42 echo " $ngx_pcre_ver major version found" |
38 | 43 |
39 # to allow -ipo optimization we link with the *.o but not library | 44 # to allow -ipo optimization we link with the *.o but not library |