Mercurial > hg > nginx-vendor-current

comparison auto/lib/pcre/conf @ 274:052a7b1d40e5 NGINX_0_5_7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.5.7 *) Feature: the ssl_session_cache storage optimization. *) Bugfixes in the "ssl_session_cache" and "limit_zone" directives. *) Bugfix: the segmentation fault was occurred on start or while reconfiguration if the "ssl_session_cache" or "limit_zone" directives were used on 64-bit platforms. *) Bugfix: a segmentation fault occurred if the "add_before_body" or "add_after_body" directives were used and there was no "Content-Type" header line in response. *) Bugfix: the OpenSSL library was always built with the threads support. Thanks to Den Ivanov. *) Bugfix: the PCRE-6.5+ library and the icc compiler compatibility.
author Igor Sysoev <http://sysoev.ru>
date Mon, 15 Jan 2007 00:00:00 +0300
parents 6ae1357b7b7c
children 675a39fd14cd
comparison
equal deleted inserted replaced
273:60df8db42ffb 274:052a7b1d40e5
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