Mercurial > hg > nginx-vendor-current

annotate auto/lib/openssl/conf @ 492:98143f74eb3d NGINX_0_7_58

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 829f9a66a659
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
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5 if [ $OPENSSL != NONE ]; then
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7 case "$CC" in
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
8
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
9 cl | bcc32)
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
10 have=NGX_OPENSSL . auto/have
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
11 have=NGX_SSL . auto/have
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
12
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
13 CFLAGS="$CFLAGS -DNO_SYS_TYPES_H"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
14
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
15 CORE_INCS="$CORE_INCS $OPENSSL/openssl/include"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
16 CORE_DEPS="$CORE_DEPS $OPENSSL/openssl/include/openssl/ssl.h"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
17 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/ssleay32.lib"
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
18 CORE_LIBS="$CORE_LIBS $OPENSSL/openssl/lib/libeay32.lib"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
19
482
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
20 # libeay32.lib requires gdi32.lib
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
21 CORE_LIBS="$CORE_LIBS gdi32.lib"
480
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
22 ;;
549994537f15 nginx 0.7.52
Igor Sysoev <http://sysoev.ru>
parents: 258
diff changeset
23
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 *)
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 have=NGX_OPENSSL . auto/have
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
26 have=NGX_SSL . auto/have
492
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
27
98143f74eb3d nginx 0.7.58
Igor Sysoev <http://sysoev.ru>
parents: 488
diff changeset
28 CORE_INCS="$CORE_INCS $OPENSSL/include"
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 LINK_DEPS="$LINK_DEPS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 CORE_LIBS="$CORE_LIBS $OPENSSL/libssl.a $OPENSSL/libcrypto.a"
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 ;;
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
32 esac
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
34 case "$NGX_SYSTEM" in
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
35 SunOS|Linux)
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 482
diff changeset
36 CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
37 ;;
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 esac
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
28
7ca9bdc82b3f nginx 0.1.14
Igor Sysoev <http://sysoev.ru>
parents: 18
diff changeset
40
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 else
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
43 case "$NGX_PLATFORM" in
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
45 win32)
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
46 have=NGX_OPENSSL . auto/have
126
df17fbafec8f nginx 0.3.10
Igor Sysoev <http://sysoev.ru>
parents: 110
diff changeset
47 have=NGX_SSL . auto/have
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 OPENSSL=YES
110
dad2fe8ecf08 nginx 0.3.2
Igor Sysoev <http://sysoev.ru>
parents: 90
diff changeset
49
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
50 CORE_INCS="$CORE_INCS c:/openssl/include"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
51 CORE_LIBS="$CORE_LIBS c:/openssl/ssleay32.lib"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
52 CORE_LIBS="$CORE_LIBS c:/openssl/libeay32.lib"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
53
482
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
54 # libeay32.lib requires gdi32.lib
392c16f2d858 nginx 0.7.53
Igor Sysoev <http://sysoev.ru>
parents: 480
diff changeset
55 CORE_LIBS="$CORE_LIBS gdi32.lib"
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
56 ;;
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
57
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
58 *)
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
59 OPENSSL=NO
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
61 ngx_feature="OpenSSL library"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
62 ngx_feature_name="NGX_OPENSSL"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
63 ngx_feature_run=no
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
64 ngx_feature_incs="#include <openssl/ssl.h>"
258
6ae1357b7b7c nginx 0.4.14
Igor Sysoev <http://sysoev.ru>
parents: 132
diff changeset
65 ngx_feature_path=
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
66 ngx_feature_libs="-lssl -lcrypto"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
67 ngx_feature_test="SSL_library_init()"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
68 . auto/feature
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
69
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
70 if [ $ngx_found = yes ]; then
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
71 have=NGX_SSL . auto/have
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
72 CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
73 OPENSSL=YES
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
74
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
75 case "$NGX_SYSTEM" in
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
76 SunOS)
488
829f9a66a659 nginx 0.7.56
Igor Sysoev <http://sysoev.ru>
parents: 482
diff changeset
77 CORE_LIBS="$CORE_LIBS $NGX_LIBDL"
132
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
78 ;;
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
79 esac
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
80 fi
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
81 ;;
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
82
91372f004adf nginx 0.3.13
Igor Sysoev <http://sysoev.ru>
parents: 126
diff changeset
83 esac
0
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84
f0b350454894 nginx 0.1.0
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85 fi