Mercurial > hg > nginx
comparison auto/lib/conf @ 2940:cb3d4dc8c6db stable-0.7
merge r2893, r2894, and r2917:
various ./configure fixes:
*) use md5/sha1 in OpenSSL only if OpenSSL is used
*) stop ./configure at once on library failure
*) librt must be tested before creating Makefile
the bug has been introduced in r2817
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 15 Jun 2009 08:49:53 +0000 |
parents | a16ec9e1b4d1 |
children | 0ecc8d7c77b1 |
comparison
equal
deleted
inserted
replaced
2939:7d8667499ddc | 2940:cb3d4dc8c6db |
---|---|
2 # Copyright (C) Igor Sysoev | 2 # Copyright (C) Igor Sysoev |
3 | 3 |
4 | 4 |
5 if [ $USE_PCRE = YES -o $PCRE != NONE ]; then | 5 if [ $USE_PCRE = YES -o $PCRE != NONE ]; then |
6 . auto/lib/pcre/conf | 6 . auto/lib/pcre/conf |
7 | |
8 else | |
9 if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then | |
10 | |
11 cat << END | |
12 | |
13 $0: error: the HTTP rewrite module requires the PCRE library. | |
14 You can either disable the module by using --without-http_rewrite_module | |
15 option or you have to enable the PCRE support. | |
16 | |
17 END | |
18 exit 1 | |
19 fi | |
7 fi | 20 fi |
21 | |
8 | 22 |
9 if [ $USE_OPENSSL = YES ]; then | 23 if [ $USE_OPENSSL = YES ]; then |
10 . auto/lib/openssl/conf | 24 . auto/lib/openssl/conf |
11 fi | 25 fi |
12 | 26 |
13 if [ $USE_MD5 = YES ]; then | 27 if [ $USE_MD5 = YES ]; then |
14 | 28 |
15 if [ $OPENSSL != NONE -a $OPENSSL != NO ]; then | 29 if [ $USE_OPENSSL = YES ]; then |
16 have=NGX_HAVE_OPENSSL_MD5_H . auto/have | 30 have=NGX_HAVE_OPENSSL_MD5_H . auto/have |
17 have=NGX_OPENSSL_MD5 . auto/have | 31 have=NGX_OPENSSL_MD5 . auto/have |
18 MD5=YES | 32 MD5=YES |
19 MD5_LIB=OpenSSL | 33 MD5_LIB=OpenSSL |
20 | 34 |
24 | 38 |
25 fi | 39 fi |
26 | 40 |
27 if [ $USE_SHA1 = YES ]; then | 41 if [ $USE_SHA1 = YES ]; then |
28 | 42 |
29 if [ $OPENSSL != NONE -a $OPENSSL != NO ]; then | 43 if [ $USE_OPENSSL = YES ]; then |
30 have=NGX_HAVE_OPENSSL_SHA1_H . auto/have | 44 have=NGX_HAVE_OPENSSL_SHA1_H . auto/have |
31 SHA1=YES | 45 SHA1=YES |
32 SHA1_LIB=OpenSSL | 46 SHA1_LIB=OpenSSL |
33 | 47 |
34 else | 48 else |