Mercurial > hg > nginx-vendor-current

diff auto/lib/conf @ 26:45fe5b98a9de NGINX_0_1_13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.13 *) Feature: the server_names_hash and server_names_hash_threshold directives. *) Bugfix: the *.domain.tld names in the "server_name" directive did not work. *) Bugfix: the %request_length log parameter logged the incorrect length.
author Igor Sysoev <http://sysoev.ru>
date Tue, 21 Dec 2004 00:00:00 +0300
parents f0b350454894
children e1ada20fc595
line wrap: on
line diff
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -6,12 +6,21 @@ if [ $USE_PCRE = YES ]; then
     . auto/lib/pcre/conf
 fi
 
-if [ $USE_MD5 = YES ]; then
-    . auto/lib/md5/conf
+if [ $USE_OPENSSL = YES ]; then
+    . auto/lib/openssl/conf
 fi
 
-if [ $USE_OPENSSL = YES ]; then
-    . auto/lib/openssl/conf
+if [ $USE_MD5 = YES ]; then
+
+    if [ $OPENSSL != NONE -a $OPENSSL != NO ]; then
+        have=NGX_HAVE_OPENSSL_MD5_H . auto/have
+        have=NGX_OPENSSL_MD5 . auto/have
+        MD5=YES
+
+    else
+        . auto/lib/md5/conf
+    fi
+
 fi
 
 if [ $USE_ZLIB = YES ]; then