summaryrefslogtreecommitdiffhomepage
path: root/auto/lib
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-05-16 14:54:50 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-05-16 14:54:50 +0000
commit5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1 (patch)
tree37bc6eae1d5fa69c41621d03f93d06fb5e7d9dd9 /auto/lib
parentffc72712505da246d7d55300f71693e55a36957d (diff)
downloadnginx-5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1.tar.gz
nginx-5dc5945ccf6e64b7b36bb620f4b24e6fdb2364b1.tar.bz2
"$apr1", "{PLAIN}", and "{SSHA}" password methods in auth basic module
patch by Maxim Dounin
Diffstat (limited to 'auto/lib')
-rw-r--r--auto/lib/conf1
-rw-r--r--auto/lib/sha1/conf3
2 files changed, 3 insertions, 1 deletions
diff --git a/auto/lib/conf b/auto/lib/conf
index f89d922f8..357e7810d 100644
--- a/auto/lib/conf
+++ b/auto/lib/conf
@@ -43,6 +43,7 @@ if [ $USE_SHA1 = YES ]; then
if [ $USE_OPENSSL = YES ]; then
have=NGX_HAVE_OPENSSL_SHA1_H . auto/have
+ have=NGX_HAVE_SHA1 . auto/have
SHA1=YES
SHA1_LIB=OpenSSL
diff --git a/auto/lib/sha1/conf b/auto/lib/sha1/conf
index 888537779..af3d3fba2 100644
--- a/auto/lib/sha1/conf
+++ b/auto/lib/sha1/conf
@@ -4,6 +4,7 @@
if [ $SHA1 != NONE ]; then
+ have=NGX_HAVE_SHA1 . auto/have
CORE_INCS="$CORE_INCS $SHA1"
case "$NGX_CC_NAME" in
@@ -41,7 +42,7 @@ else
# FreeBSD
ngx_feature="sha1 in system md library"
- ngx_feature_name=
+ ngx_feature_name=NGX_HAVE_SHA1
ngx_feature_run=no
ngx_feature_incs="#include <sha.h>"
ngx_feature_path=