Mercurial > hg > nginx

diff auto/lib/conf @ 477:ad1e9ebf93bb release-0.1.13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.13-RELEASE import *) 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 <igor@sysoev.ru>
date Tue, 21 Dec 2004 12:30:30 +0000
parents 42d11f017717
children fd661d14a7fa
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