Code

configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing v1.6.4-rc2
authorBrandon Casey <drafnel@gmail.com>
Wed, 22 Jul 2009 22:20:53 +0000 (17:20 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Jul 2009 04:57:41 +0000 (21:57 -0700)
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>
configure.ac

index ba44cf248f445acd1633b1abd08f8dee24d6f62c..3f1922d0bf66abdbcad03dfd9981ca5293a4b860 100644 (file)
@@ -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)