From: Brandon Casey Date: Wed, 22 Jul 2009 22:20:53 +0000 (-0500) Subject: configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing X-Git-Tag: v1.6.4-rc2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4122552ec8eed216c3bcbd00b31b818ad13b7e1;p=git.git configure.ac: properly unset NEEDS_SSL_WITH_CRYPTO when sha1 func is missing 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 Signed-off-by: Junio C Hamano --- diff --git a/configure.ac b/configure.ac index ba44cf248..3f1922d0b 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)