Skip to content

Commit 0ad8ff2

Browse files
drafnelgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 24deea5 commit 0ad8ff2

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

configure.ac

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,8 @@ GIT_STASH_FLAGS($OPENSSLDIR)
342342
AC_CHECK_LIB([crypto], [SHA1_Init],
343343
[NEEDS_SSL_WITH_CRYPTO=],
344344
[AC_CHECK_LIB([ssl], [SHA1_Init],
345-
[NEEDS_SSL_WITH_CRYPTO=YesPlease
346-
NEEDS_SSL_WITH_CRYPTO=],
347-
[NO_OPENSSL=YesPlease])])
345+
[NEEDS_SSL_WITH_CRYPTO=YesPlease],
346+
[NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])])
348347

349348
GIT_UNSTASH_FLAGS($OPENSSLDIR)
350349

0 commit comments

Comments
 (0)