Mercurial > hg > nginx

comparison auto/lib/pcre/conf @ 1006:0d0c74b73573

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
icc and PCRE-6.5+ compatibility
author Igor Sysoev <igor@sysoev.ru>
date Wed, 10 Jan 2007 16:15:49 +0000
parents 853abb6c4c89
children c7850d8b5239
comparison
equal deleted inserted replaced
1005:89ceaab8223a 1006:0d0c74b73573
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 ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \ 28 if [ -e $PCRE/pcre.h ]; then
29 | sed -e 's/^.*=\(.*\)$/\1/'` 29 ngx_pcre_ver=`grep PCRE_MAJOR $PCRE/pcre.h \
30 | sed -e 's/^.*PCRE_MAJOR.* \(.*\)$/\1/'`
31
32 else
33 ngx_pcre_ver=`grep PCRE_MAJOR= $PCRE/configure.in \
34 | sed -e 's/^.*=\(.*\)$/\1/'`
35 fi
30 36
31 echo " $ngx_pcre_ver major version found" 37 echo " $ngx_pcre_ver major version found"
32 38
33 # to allow -ipo optimization we link with the *.o but not library 39 # to allow -ipo optimization we link with the *.o but not library
34 40
35 case "$ngx_pcre_ver" in 41 case "$ngx_pcre_ver" in
42 4|5)
43 CORE_LIBS="$CORE_LIBS $PCRE/pcre.o"
44 ;;
45
36 6) 46 6)
37 CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o" 47 CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
38 CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o" 48 CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
39 CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o" 49 CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o"
40 CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o" 50 CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o"
42 CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o" 52 CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o"
43 CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o" 53 CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o"
44 ;; 54 ;;
45 55
46 *) 56 *)
47 CORE_LIBS="$CORE_LIBS $PCRE/pcre.o" 57 CORE_LIBS="$CORE_LIBS $PCRE/pcre_chartables.o"
58 CORE_LIBS="$CORE_LIBS $PCRE/pcre_compile.o"
59 CORE_LIBS="$CORE_LIBS $PCRE/pcre_exec.o"
60 CORE_LIBS="$CORE_LIBS $PCRE/pcre_fullinfo.o"
61 CORE_LIBS="$CORE_LIBS $PCRE/pcre_globals.o"
62 CORE_LIBS="$CORE_LIBS $PCRE/pcre_tables.o"
63 CORE_LIBS="$CORE_LIBS $PCRE/pcre_try_flipped.o"
64 CORE_LIBS="$CORE_LIBS $PCRE/pcre_newline.o"
48 ;; 65 ;;
66
49 esac 67 esac
50 ;; 68 ;;
51 69
52 *) 70 *)
53 have=NGX_PCRE . auto/have 71 have=NGX_PCRE . auto/have