diff options
| author | Brandon Casey <drafnel@gmail.com> | 2009-07-23 02:20:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-23 08:57:41 +0400 |
| commit | 0ad8ff2cd185e84fd49dd961370411e379681f10 (patch) | |
| tree | 0a2649664252fba36d2881c28ae41d3caea8c483 | |
| parent | 24deea5273709f3685f981c33468a0cead6cc147 (diff) | |
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>
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ba44cf248f..3f1922d0bf 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) |