Mercurial > hg > nginx-vendor-1-0
comparison auto/lib/openssl/make @ 492:98143f74eb3d NGINX_0_7_58
nginx 0.7.58
*) Feature: a "listen" directive of the mail proxy module supports IPv6.
*) Feature: the "image_filter_jpeg_quality" directive.
*) Feature: the "client_body_in_single_buffer" directive.
*) Feature: the $request_body variable.
*) Bugfix: in ngx_http_autoindex_module in file name links having a ":"
symbol in the name.
*) Bugfix: "make upgrade" procedure did not work; the bug had appeared
in 0.7.53.
Thanks to Denis F. Latypoff.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 18 May 2009 00:00:00 +0400 |
parents | e66f886a8305 |
children | 499474178a11 |
comparison
equal
deleted
inserted
replaced
491:bb2281a3edb6 | 492:98143f74eb3d |
---|---|
1 | 1 |
2 # Copyright (C) Igor Sysoev | 2 # Copyright (C) Igor Sysoev |
3 | 3 |
4 | 4 |
5 if test -n "$OPENSSL_OPT"; then | 5 if test -n "$OPENSSL_OPT"; then |
6 NGX_OPENSSL_CONFIG="./Configure \"$OPENSSL_OPT\"" | 6 NGX_OPENSSL_CONFIG="./Configure $OPENSSL_OPT" |
7 else | 7 else |
8 NGX_OPENSSL_CONFIG="./config" | 8 NGX_OPENSSL_CONFIG="./config" |
9 fi | 9 fi |
10 | 10 |
11 case $USE_THREADS in | 11 case $USE_THREADS in |
12 NO) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG no-threads" ;; | 12 NO) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG no-threads" ;; |
13 *) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;; | 13 *) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;; |
14 esac | 14 esac |
15 | 15 |
16 case "$CC" in | 16 case "$CC" in |
17 | |
17 cl) | 18 cl) |
19 | |
18 cat << END >> $NGX_MAKEFILE | 20 cat << END >> $NGX_MAKEFILE |
19 | 21 |
20 $OPENSSL/out32/ssleay32.lib: | 22 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE |
21 cd $OPENSSL | 23 \$(MAKE) -f auto/lib/openssl/makefile.msvc \ |
22 perl Configure VC-WIN32 no-shared | 24 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT" |
23 ms\\do_ms | |
24 \$(MAKE) -f ms\\nt.mak | |
25 cd \$(CURDIR) | |
26 | 25 |
27 END | 26 END |
28 | 27 |
29 ;; | 28 ;; |
30 | 29 |
31 bcc32) | 30 cl | bcc32) |
31 | |
32 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \ | |
33 | sed -e "s/\//$ngx_regex_dirsep/g"` | |
34 | |
32 cat << END >> $NGX_MAKEFILE | 35 cat << END >> $NGX_MAKEFILE |
33 | 36 |
34 `echo "$OPENSSL\\out32\\libeay32.lib: $OPENSSL\\out32\\ssleay32.lib" \ | 37 `echo "$OPENSSL\\openssl\\lib\\libeay32.lib: \ |
38 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \ | |
35 | sed -e "s/\//$ngx_regex_dirsep/g"` | 39 | sed -e "s/\//$ngx_regex_dirsep/g"` |
36 | 40 |
37 `echo "$OPENSSL\\out32\\ssleay32.lib:" | sed -e "s/\//$ngx_regex_dirsep/g"` | 41 `echo "$OPENSSL\\openssl\\lib\\ssleay32.lib: \ |
38 cd `echo "$OPENSSL" | sed -e "s/\//$ngx_regex_dirsep/g"` | 42 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \ |
39 perl Configure BC-32 no-shared | 43 | sed -e "s/\//$ngx_regex_dirsep/g"` |
40 ms\\do_nasm | 44 |
41 \$(MAKE) -f ms\\bcb.mak | 45 `echo "$OPENSSL\\openssl\\include\\openssl\\ssl.h: $NGX_MAKEFILE" \ |
42 cd \$(CURDIR) | 46 | sed -e "s/\//$ngx_regex_dirsep/g"` |
47 \$(MAKE) -f auto/lib/openssl/makefile.bcc $ngx_opt | |
43 | 48 |
44 END | 49 END |
45 | 50 |
46 ;; | 51 ;; |
47 | 52 |
48 *) | 53 *) |
49 cat << END >> $NGX_MAKEFILE | 54 cat << END >> $NGX_MAKEFILE |
50 | 55 |
51 $OPENSSL/libssl.a: | 56 $OPENSSL/libssl.a: $NGX_MAKEFILE |
52 cd $OPENSSL \\ | 57 cd $OPENSSL \\ |
53 && \$(MAKE) clean \\ | 58 && \$(MAKE) clean \\ |
54 && $NGX_OPENSSL_CONFIG no-shared \\ | 59 && $NGX_OPENSSL_CONFIG no-shared \\ |
55 && \$(MAKE) | 60 && \$(MAKE) |
56 | 61 |