# HG changeset patch
# User Piotr Sikora <piotrsikora@google.com>
# Date 1445649693 25200
# Fri Oct 23 18:21:33 2015 -0700
# Node ID 84b5500257121c6bd3e1c0e778cfde8915bf3fcc
# Parent 7435401242d6dbfdb4b42339ab2d96ed30d397a7
Configure: remove redundant NGX_OPENSSL_MD5.

Previously, both NGX_OPENSSL_MD5 and NGX_HAVE_OPENSSL_MD5_H
had to be defined.

While there, add missing _H to NGX_HAVE_OPENSSL_MD5.

Signed-off-by: Piotr Sikora <piotrsikora@google.com>

diff -r 7435401242d6 -r 84b550025712 auto/lib/conf
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -29,7 +29,6 @@ if [ $USE_MD5 = YES ]; then

if [ $USE_OPENSSL = YES ]; then
have=NGX_HAVE_OPENSSL_MD5_H . auto/have
- have=NGX_OPENSSL_MD5 . auto/have
have=NGX_HAVE_MD5 . auto/have
MD5=YES
MD5_LIB=OpenSSL
diff -r 7435401242d6 -r 84b550025712 auto/lib/md5/conf
--- a/auto/lib/md5/conf
+++ b/auto/lib/md5/conf
@@ -8,8 +8,7 @@ if [ $MD5 != NONE ]; then
if grep MD5_Init $MD5/md5.h 2>&1 >/dev/null; then
# OpenSSL md5
OPENSSL_MD5=YES
- have=NGX_HAVE_OPENSSL_MD5 . auto/have
- have=NGX_OPENSSL_MD5 . auto/have
+ have=NGX_HAVE_OPENSSL_MD5_H . auto/have
else
# rsaref md5
OPENSSL_MD5=NO
@@ -79,7 +78,6 @@ else
# OpenSSL crypto library

ngx_feature="md5 in system OpenSSL crypto library"
- ngx_feature_name="NGX_OPENSSL_MD5"
ngx_feature_incs="#include <openssl/md5.h>"
ngx_feature_libs="-lcrypto"
ngx_feature_test="MD5_CTX md5; MD5_Init(&md5)"
@@ -89,7 +87,6 @@ else

if [ $ngx_found = yes ]; then
have=NGX_HAVE_OPENSSL_MD5_H . auto/have
- have=NGX_HAVE_MD5 . auto/have
fi
fi

diff -r 7435401242d6 -r 84b550025712 src/core/ngx_md5.h
--- a/src/core/ngx_md5.h
+++ b/src/core/ngx_md5.h
@@ -25,7 +25,7 @@
typedef MD5_CTX ngx_md5_t;


-#if (NGX_OPENSSL_MD5)
+#if (NGX_HAVE_OPENSSL_MD5_H)

#define ngx_md5_init MD5_Init
#define ngx_md5_update MD5_Update

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel