Mercurial > hg > nginx
annotate auto/lib/md5/conf @ 6397:78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Now we always set NGX_CC_NAME to "msvc", and additionally test compiler
version as reported by "cl" in auto/cc/msvc (the same version is also
available via the _MSC_VER define). In particular, this approach allows
to properly check for C99 variadic macros support, which previously was
not used with MSVC versions not explicitly recognized.
Now unneeded wildcards in NGX_CC_NAME tests for msvc removed accordingly,
as well as unused wildcards for owc and icc.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 13 Feb 2016 06:47:34 +0300 |
parents | b0a616778038 |
children |
rev | line source |
---|---|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
1 |
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
4412 | 3 # Copyright (C) Nginx, Inc. |
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
376
diff
changeset
|
4 |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
5 |
253
b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
248
diff
changeset
|
6 if [ $MD5 != NONE ]; then |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 |
2707 | 8 if grep MD5_Init $MD5/md5.h 2>&1 >/dev/null; then |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 # OpenSSL md5 |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 OPENSSL_MD5=YES |
469 | 11 have=NGX_HAVE_OPENSSL_MD5 . auto/have |
477 | 12 have=NGX_OPENSSL_MD5 . auto/have |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
13 else |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
14 # rsaref md5 |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
15 OPENSSL_MD5=NO |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
16 fi |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
17 |
3895
b659514a3948
an internal MD5 implemenation
Igor Sysoev <igor@sysoev.ru>
parents:
3684
diff
changeset
|
18 have=NGX_HAVE_MD5 . auto/have |
297
ee394e997c77
nginx-0.0.3-2004-03-29-21:43:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
295
diff
changeset
|
19 CORE_INCS="$CORE_INCS $MD5" |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
20 |
455 | 21 case "$NGX_CC_NAME" in |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
22 |
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5179
diff
changeset
|
23 msvc | owc | bcc) |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
24 LINK_DEPS="$LINK_DEPS $MD5/md5.lib" |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
25 CORE_LIBS="$CORE_LIBS $MD5/md5.lib" |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
26 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
27 |
6397
78f8ac479735
Win32: simplified and improved handling of MSVC versions.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5179
diff
changeset
|
28 icc) |
288
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
29 LINK_DEPS="$LINK_DEPS $MD5/libmd5.a" |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
30 |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
31 # to allow -ipo optimization we link with the *.o but not library |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
32 CORE_LIBS="$CORE_LIBS $MD5/md5_dgst.o" |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
33 |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
34 if [ $MD5_ASM = YES ]; then |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
35 CORE_LIBS="$CORE_LIBS $MD5/asm/mx86-elf.o" |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
36 fi |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
37 ;; |
f81d075ad172
nginx-0.0.2-2004-03-14-23:46:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
38 |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
39 *) |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
40 LINK_DEPS="$LINK_DEPS $MD5/libmd5.a" |
306
6b91bfbc4123
nginx-0.0.3-2004-04-05-00:32:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
41 CORE_LIBS="$CORE_LIBS $MD5/libmd5.a" |
6b91bfbc4123
nginx-0.0.3-2004-04-05-00:32:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
297
diff
changeset
|
42 #CORE_LIBS="$CORE_LIBS -L $MD5 -lmd5" |
282
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
43 ;; |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
44 |
30310107dbc9
nginx-0.0.2-2004-03-09-22:47:07 import
Igor Sysoev <igor@sysoev.ru>
parents:
266
diff
changeset
|
45 esac |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
46 |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
47 else |
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
48 |
493 | 49 if [ "$NGX_PLATFORM" != win32 ]; then |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
50 |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
51 MD5=NO |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
52 |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
53 # FreeBSD, Solaris 10 |
253
b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
248
diff
changeset
|
54 |
5179
b0a616778038
Configure: uniformly refer to libs when searching for md5 and sha1.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
55 ngx_feature="md5 in system md library" |
3895
b659514a3948
an internal MD5 implemenation
Igor Sysoev <igor@sysoev.ru>
parents:
3684
diff
changeset
|
56 ngx_feature_name=NGX_HAVE_MD5 |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
57 ngx_feature_run=no |
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
58 ngx_feature_incs="#include <md5.h>" |
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
59 ngx_feature_path= |
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
60 ngx_feature_libs="-lmd" |
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
61 ngx_feature_test="MD5_CTX md5; MD5Init(&md5)" |
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
62 . auto/feature |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
63 |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
64 ngx_md5_lib="system md" |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
65 |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
66 if [ $ngx_found = no ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
67 |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
68 # Solaris 8/9 |
266
5238e93961a1
nginx-0.0.2-2004-02-23-23:57:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
265
diff
changeset
|
69 |
5179
b0a616778038
Configure: uniformly refer to libs when searching for md5 and sha1.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
70 ngx_feature="md5 in system md5 library" |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
71 ngx_feature_libs="-lmd5" |
455 | 72 . auto/feature |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
73 |
2815
304bfc6faf07
move libmd test before libmd5,
Igor Sysoev <igor@sysoev.ru>
parents:
2707
diff
changeset
|
74 ngx_md5_lib="system md5" |
307
ce375c313e96
nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
306
diff
changeset
|
75 fi |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
76 |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
77 if [ $ngx_found = no ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
78 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
79 # OpenSSL crypto library |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
80 |
5179
b0a616778038
Configure: uniformly refer to libs when searching for md5 and sha1.
Ruslan Ermilov <ru@nginx.com>
parents:
4412
diff
changeset
|
81 ngx_feature="md5 in system OpenSSL crypto library" |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
82 ngx_feature_name="NGX_OPENSSL_MD5" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
83 ngx_feature_incs="#include <openssl/md5.h>" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
84 ngx_feature_libs="-lcrypto" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
85 ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
86 . auto/feature |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
87 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
88 ngx_md5_lib="system crypto" |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
89 |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
90 if [ $ngx_found = yes ]; then |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
91 have=NGX_HAVE_OPENSSL_MD5_H . auto/have |
3896 | 92 have=NGX_HAVE_MD5 . auto/have |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
93 fi |
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
94 fi |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
95 |
307
ce375c313e96
nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
306
diff
changeset
|
96 if [ $ngx_found = yes ]; then |
455 | 97 CORE_LIBS="$CORE_LIBS $ngx_feature_libs" |
307
ce375c313e96
nginx-0.0.3-2004-04-08-19:58:25 import
Igor Sysoev <igor@sysoev.ru>
parents:
306
diff
changeset
|
98 MD5=YES |
2010
bd6cc5370fc1
simplify library autoconfigure
Igor Sysoev <igor@sysoev.ru>
parents:
875
diff
changeset
|
99 MD5_LIB=$ngx_md5_lib |
3684
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2950
diff
changeset
|
100 fi |
4d47a0658e7d
stop ./configure on Win32 if no library sources was specified,
Igor Sysoev <igor@sysoev.ru>
parents:
2950
diff
changeset
|
101 fi |
2893
da1ba8a5c8c9
stop ./configure at once on library failure
Igor Sysoev <igor@sysoev.ru>
parents:
2815
diff
changeset
|
102 |
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
103 fi |