annotate auto/lib/openssl/make @ 501: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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
3
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 50
diff changeset
4
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
5 if test -n "$OPENSSL_OPT"; then
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
6 NGX_OPENSSL_CONFIG="./Configure $OPENSSL_OPT"
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
7 else
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
8 NGX_OPENSSL_CONFIG="./config"
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
9 fi
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
10
274
052a7b1d40e5 nginx 0.5.7
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
11 case $USE_THREADS in
052a7b1d40e5 nginx 0.5.7
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
12 NO) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG no-threads" ;;
052a7b1d40e5 nginx 0.5.7
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
13 *) NGX_OPENSSL_CONFIG="$NGX_OPENSSL_CONFIG threads" ;;
052a7b1d40e5 nginx 0.5.7
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
14 esac
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
16 case "$CC" in
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
17
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
18 cl)
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
19
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
20 cat << END >> $NGX_MAKEFILE
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
21
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
22 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
23 \$(MAKE) -f auto/lib/openssl/makefile.msvc \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
24 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
25
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
26 END
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
27
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
28 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
29
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
30 cl | bcc32)
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
31
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
32 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
33 | sed -e "s/\//$ngx_regex_dirsep/g"`
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
34
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
35 cat << END >> $NGX_MAKEFILE
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
36
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
37 `echo "$OPENSSL\\openssl\\lib\\libeay32.lib: \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
38 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
39 | sed -e "s/\//$ngx_regex_dirsep/g"`
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
40
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
41 `echo "$OPENSSL\\openssl\\lib\\ssleay32.lib: \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
42 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
43 | sed -e "s/\//$ngx_regex_dirsep/g"`
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
44
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
45 `echo "$OPENSSL\\openssl\\include\\openssl\\ssl.h: $NGX_MAKEFILE" \
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
46 | sed -e "s/\//$ngx_regex_dirsep/g"`
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
47 \$(MAKE) -f auto/lib/openssl/makefile.bcc $ngx_opt
489
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
48
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
49 END
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
50
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
51 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 274
diff changeset
52
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53 *)
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
54 cat << END >> $NGX_MAKEFILE
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
55
501
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 499
diff changeset
56 $OPENSSL/libssl.a: $NGX_MAKEFILE
50
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
57 cd $OPENSSL \\
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
58 && \$(MAKE) clean \\
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
59 && $NGX_OPENSSL_CONFIG no-shared \\
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
60 && \$(MAKE)
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
61
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
62 END
72eb30262aac nginx 0.1.25
Igor Sysoev <http://sysoev.ru>
parents: 42
diff changeset
63
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 ;;
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 esac