[PATCH 3/5] autoconf: Fix NEEDS_SSL_WITH_CRYPTO detection
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Aug 4, 2006, 21:28 UTC
- Message-ID
- <200608042328.58539.jnareb@gmail.com>
- In-Reply-To
- <200608042333.19011.jnareb@gmail.com>
>From 7829f2f76c429594602d845168841d378d269fba Mon Sep 17 00:00:00 2001
From: Junio C Hamano <junkio@cox.net> Date: Fri, 4 Aug 2006 13:06:33 -0700 Subject: [PATCH 3/5] autoconf: Fix NEEDS_SSL_WITH_CRYPTO detection
NEEDS_SSL_WITH_CRYPTO means you cannot just say "-lcrypto" to use SHA1 stuff, but need to say "-lcrypto -lssl", so the test should say "if we can get away with -lcrypto, we are happy, otherwise if we need -lssl, then say NEEDS_SSL_WITH_CRYPTO, otherwise we cannot use OpenSSL so say NO_OPENSSL", or something like that.
Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- configure.ac | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac index 61c9fa3..a49bd1f 100644 --- a/configure.ac +++ b/configure.ac @@ -154,8 +154,8 @@ AC_MSG_NOTICE([CHECKS for libraries]) # # Define NO_OPENSSL environment variable if you do not have OpenSSL. # Define NEEDS_SSL_WITH_CRYPTO if you need -lcrypto with -lssl (Darwin). -AC_CHECK_LIB([ssl], [SHA1_Init],[], -[AC_CHECK_LIB([crypto], [SHA1_Init], +AC_CHECK_LIB([crypto], [SHA1_Init],[], +[AC_CHECK_LIB([ssl], [SHA1_Init], [GIT_CONF_APPEND_LINE(NEEDS_SSL_WITH_CRYPTO=YesPlease)], [GIT_CONF_APPEND_LINE(NO_OPENSSL=YesPlease)])]) #
-- 1.4.1.1