summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2009-07-22 22:20:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-23 04:57:41 (GMT)
commit0ad8ff2cd185e84fd49dd961370411e379681f10 (patch)
tree0a2649664252fba36d2881c28ae41d3caea8c483 /configure.ac
parent24deea5273709f3685f981c33468a0cead6cc147 (diff)
downloadgit-0ad8ff2cd185e84fd49dd961370411e379681f10.zip
git-0ad8ff2cd185e84fd49dd961370411e379681f10.tar.gz
git-0ad8ff2cd185e84fd49dd961370411e379681f10.tar.bz2
configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missingv1.6.4-rc2
The empty assignment NEEDS_SSL_WITH_CRYPTO= was mistakenly paired with the assignment NEEDS_SSL_WITH_CRYPTO=YesPlease in the "action-if-found" parameter of the AC_CHECK_LIB macro. The empty assignment was intended for the "action-if-not-found" section, since in that case, the necessary sha1 hash function was not found and the internal sha1 implementation will be used instead. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index ba44cf2..3f1922d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -342,9 +342,8 @@ GIT_STASH_FLAGS($OPENSSLDIR)
AC_CHECK_LIB([crypto], [SHA1_Init],
[NEEDS_SSL_WITH_CRYPTO=],
[AC_CHECK_LIB([ssl], [SHA1_Init],
- [NEEDS_SSL_WITH_CRYPTO=YesPlease
- NEEDS_SSL_WITH_CRYPTO=],
- [NO_OPENSSL=YesPlease])])
+ [NEEDS_SSL_WITH_CRYPTO=YesPlease],
+ [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])])
GIT_UNSTASH_FLAGS($OPENSSLDIR)