summaryrefslogtreecommitdiffhomepage
path: root/auto/lib/md5/conf
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-10-21 15:34:38 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-10-21 15:34:38 +0000
commitc0edbcce58b03b89c70f1eb39cb44c74c4c7453a (patch)
tree1ce72a5b51d724a0c054e079c2b1507ca85a145d /auto/lib/md5/conf
parentac64333a44f39d5a658832517a106961f32f6aae (diff)
downloadnginx-release-0.1.2.tar.gz
nginx-release-0.1.2.tar.bz2
nginx-0.1.2-RELEASE importrelease-0.1.2
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS options in configure. *) Feature: the server_name directive supports *.domain.tld. *) Bugfix: the portability improvements. *) Bugfix: if configuration file was set in command line, the reconfiguration was impossible; the bug had appeared in 0.1.1. *) Bugfix: proxy module may get caught in an endless loop when sendfile is not used. *) Bugfix: with sendfile the response was not recoded according to the charset module directives; the bug had appeared in 0.1.1. *) Bugfix: very seldom bug in the kqueue processing. *) Bugfix: the gzip module compressed the proxied responses that was already compressed.
Diffstat (limited to 'auto/lib/md5/conf')
-rw-r--r--auto/lib/md5/conf51
1 files changed, 27 insertions, 24 deletions
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 748bea450..623986f0f 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -15,14 +15,14 @@ if [ $MD5 != NONE ]; then
CORE_INCS="$CORE_INCS $MD5"
- case "$CC" in
+ case "$NGX_CC_NAME" in
- cl | wcl386 | bcc32)
+ msvc | owc | bcc)
LINK_DEPS="$LINK_DEPS $MD5/md5.lib"
CORE_LIBS="$CORE_LIBS $MD5/md5.lib"
;;
- *icc)
+ icc)
LINK_DEPS="$LINK_DEPS $MD5/libmd5.a"
# to allow -ipo optimization we link with the *.o but not library
@@ -45,20 +45,19 @@ else
if [ $PLATFORM != win32 ]; then
MD5=NO
- ngx_lib_cflags=
# Solaris 8/9
- ngx_lib_inc="#include <sys/types.h>
-#include <md5.h>"
- ngx_lib="rsaref md5 library"
- ngx_lib_test="MD5_CTX md5; MD5Init(&md5)"
- ngx_libs=-lmd5
- . auto/lib/test
-
+ ngx_feature="rsaref md5 library"
+ ngx_feature_name="rsaref_md5"
+ ngx_feature_run=no
+ ngx_feature_incs="#include <md5.h>"
+ ngx_feature_libs="-lmd5"
+ ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
+ . auto/feature
if [ $ngx_found = yes ]; then
- CORE_LIBS="$CORE_LIBS $ngx_libs"
+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
MD5=YES
MD5_LIB=md5
ngx_found=no
@@ -66,15 +65,18 @@ else
else
# FreeBSD
- ngx_lib="rsaref md library"
- ngx_lib_test="MD5_CTX md5; MD5Init(&md5)"
- ngx_libs=-lmd
- . auto/lib/test
+ ngx_feature="rsaref md library"
+ ngx_feature_name="rsaref_md5"
+ ngx_feature_run=no
+ ngx_feature_incs="#include <md5.h>"
+ ngx_feature_libs="-lmd"
+ ngx_feature_test="MD5_CTX md5; MD5Init(&md5)"
+ . auto/feature
fi
if [ $ngx_found = yes ]; then
- CORE_LIBS="$CORE_LIBS $ngx_libs"
+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
MD5=YES
MD5_LIB=md
ngx_found=no
@@ -84,19 +86,20 @@ else
# OpenSSL crypto library
- ngx_lib_inc="#include <openssl/md5.h>"
- ngx_lib="OpenSSL md5 crypto library"
- ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)"
- ngx_libs=-lcrypto
- . auto/lib/test
+ ngx_feature="OpenSSL md5 crypto library"
+ ngx_feature_name="OpenSSL_md5"
+ ngx_feature_run=no
+ ngx_feature_incs="#include <openssl/md5.h>"
+ ngx_feature_libs="-lcrypto"
+ ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)"
+ . auto/feature
fi
fi
if [ $ngx_found = yes ]; then
- have=HAVE_OPENSSL_MD5 . auto/have
have=HAVE_OPENSSL_MD5_H . auto/have
- CORE_LIBS="$CORE_LIBS $ngx_libs"
+ CORE_LIBS="$CORE_LIBS $ngx_feature_libs"
MD5=YES
MD5_LIB=crypto
fi