diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 08:49:53 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-06-15 08:49:53 +0000 |
| commit | 219dd1c4da822c5c2223cb7ab1a3b6cfb06f6b72 (patch) | |
| tree | 446cc7cdd7b4f400592cbe62ab7cb2658e51e196 /auto/lib/openssl | |
| parent | c4f6d11856d0d5dbf1f02f107dd90f94fe70963d (diff) | |
| download | nginx-219dd1c4da822c5c2223cb7ab1a3b6cfb06f6b72.tar.gz nginx-219dd1c4da822c5c2223cb7ab1a3b6cfb06f6b72.tar.bz2 | |
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
Diffstat (limited to 'auto/lib/openssl')
| -rw-r--r-- | auto/lib/openssl/conf | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf index 8a762a2fc..731db80d7 100644 --- a/auto/lib/openssl/conf +++ b/auto/lib/openssl/conf @@ -66,6 +66,17 @@ else have=NGX_SSL . auto/have CORE_LIBS="$CORE_LIBS $ngx_feature_libs $NGX_LIBDL" OPENSSL=YES + else + +cat << END + +$0: error: SSL modules require the OpenSSL library. +You can either do not enable the modules, or install the OpenSSL library +into the system, or build the OpenSSL library statically from the source +with nginx by using --with-openssl=<path> option. + +END + exit 1 fi ;; |