commit 0ee5d3c106f98c06dbad8b61f85a7d0c8e65f970
author Igor Sysoev <igor@sysoev.ru> Fri Feb 20 16:48:59 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Feb 20 16:48:59 2004 +0000
tree 54a8e4a8fa1df4371d3e4b4cda5b171cd50460e4
parent bb1ba3fa6d8e12074afeea8c27e29699e29fb04e

nginx-0.0.2-2004-02-20-19:48:59 import

auto/lib/md5/conf

diff --git a/auto/lib/md5/conf b/auto/lib/md5/conf
index ab8b51b..4f6a636 100644
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -37,6 +37,7 @@
     if [ $ngx_found = yes ]; then
         CORE_LIBS="$CORE_LIBS $ngx_libs"
         MD5=YES
+        MD5_LIB=md5
         ngx_found=no
 
     else
@@ -51,19 +52,24 @@
     if [ $ngx_found = yes ]; then
         CORE_LIBS="$CORE_LIBS $ngx_libs"
         MD5=YES
+        MD5_LIB=md
         ngx_found=no
 
     else
-        ngx_lib="OpenSSL md5"
+        ngx_lib_inc="#include <sys/types.h>
+#include <openssl/md5.h>"
+        ngx_lib="OpenSSL md5 crypto"
         ngx_lib_test="MD5_CTX md5; MD5_Init(&md5)"
-        ngx_libs=-lmd5
+        ngx_libs=-lcrypto
         . auto/lib/test
     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"
         MD5=YES
+        MD5_LIB=crypto
     fi
 fi

auto/lib/test

diff --git a/auto/lib/test b/auto/lib/test
index 6d3f7e3..d030655 100644
--- a/auto/lib/test
+++ b/auto/lib/test
@@ -1,5 +1,5 @@
 
-echo "checking for $ngx_lib library"
+echo $ngx_n "checking for $ngx_lib library ..." $ngx_c
 echo >> $NGX_ERR
 echo "checking for $ngx_lib library" >> $NGX_ERR
 
@@ -12,12 +12,12 @@
      >> $NGX_ERR 2>&1"
 
 if [ -x $NGX_AUTOTEST ]; then
-    echo " + $ngx_lib found"
+    echo " found"
 
     ngx_found=yes
 
 else
-    echo " + $ngx_lib not found"
+    echo " not found"
 fi
 
 rm $NGX_AUTOTEST*

auto/summary

diff --git a/auto/summary b/auto/summary
index 75ae609..5dacfc1 100644
--- a/auto/summary
+++ b/auto/summary
@@ -2,15 +2,19 @@
 echo
 echo "Configuration summary"
 
-case $PCRE in
-    YES)   echo " + using system PCRE library" ;;
-    NONE)  echo " + PCRE library is not used" ;;
-    NO)    echo " + PCRE library is not found" ;;
-    *)     echo " + using PCRE library: $PCRE" ;;
-esac
+if [ $USE_PCRE = DISABLED ]; then
+    echo " + PCRE library is disabled"
+
+else
+    case $PCRE in
+        YES)   echo " + using system PCRE library" ;;
+        NO)    echo " + PCRE library is not found" ;;
+        *)     echo " + using PCRE library: $PCRE" ;;
+    esac
+fi
 
 case $MD5 in
-    YES)   echo " + using system md5 library" ;;
+    YES)   echo " + md5: using system $MD5_LIB library" ;;
     NONE)  echo " + md5 library is not used" ;;
     NO)    echo " + md5 library is not found" ;;
     *)     echo " + using md5 library: $MD5" ;;