nginx-0.0.3-2004-04-18-23:06:02 import
diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index 8871038..3fc1af6 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -41,16 +41,17 @@
 else
 
     if [ $PLATFORM != win32 ]; then
-            MD5=NO
+        MD5=NO
+        ngx_lib_cflags=
 
-            # Solaris 8/9
+        # Solaris 8/9
 
-            ngx_lib_inc="#include <sys/types.h>
+        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_lib="rsaref md5 library"
+        ngx_lib_test="MD5_CTX md5; MD5Init(&md5)"
+        ngx_libs=-lmd5
+        . auto/lib/test
 
 
         if [ $ngx_found = yes ]; then
@@ -64,7 +65,7 @@
 
             ngx_lib="rsaref md library"
             ngx_lib_test="MD5_CTX md5; MD5Init(&md5)"
-            ngx_libs=-lmd
+            #ngx_libs=-lmd
             . auto/lib/test
         fi
 
@@ -76,13 +77,16 @@
             ngx_found=no
 
         else
-            # OpenSSL crypto library
+            if [ $MD5 = NO ]; then
 
-            ngx_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
+               # 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
+            fi
         fi