git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: git@vger.kernel.org
Cc: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
Subject: [PATCH 3/3] configure: respect --without-openssl
Date: Wed, 18 Mar 2020 14:38:02 +0700	[thread overview]
Message-ID: <c08bf880c77b7c43256a275e1102308a829d0ee8.1584516715.git.congdanhqx@gmail.com> (raw)
In-Reply-To: <cover.1584516715.git.congdanhqx@gmail.com>

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
 configure.ac | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7468eb6bc8..20a11e1f32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -544,9 +544,15 @@ 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 NO_OPENSSL=],
- [NEEDS_SSL_WITH_CRYPTO=          NO_OPENSSL=YesPlease])])
+[
+if "x$NO_OPENSSL" = xYesPlease; then
+	AC_MSG_ERROR([Disabled OpenSSL is required for SHA1])
+else
+	AC_CHECK_LIB([ssl], [SHA1_Init],
+	[NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=],
+	[NEEDS_SSL_WITH_CRYPTO=          NO_OPENSSL=YesPlease])
+fi
+])
 
 GIT_UNSTASH_FLAGS($OPENSSLDIR)
 
-- 
2.26.0.rc2.234.g969ad452ca


  parent reply	other threads:[~2020-03-18  7:38 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-18  7:36 [PATCH 0/3] configure: respect --without-<package> flags Đoàn Trần Công Danh
2020-03-18  7:38 ` [PATCH 1/3] configure: respect --without-curl flags Đoàn Trần Công Danh
2020-03-18 15:51   ` Eric Sunshine
2020-03-19  3:19     ` Danh Doan
2020-03-18  7:38 ` [PATCH 2/3] configure: respect --without-expat Đoàn Trần Công Danh
2020-03-18  7:38 ` Đoàn Trần Công Danh [this message]
2020-03-18 11:22   ` [PATCH 3/3] configure: respect --without-openssl brian m. carlson
2020-03-18 11:34     ` Danh Doan
2020-03-19  3:58 ` [PATCH v2 0/3] configure: respect --without-<package> flags Đoàn Trần Công Danh
2020-03-19  3:58   ` [PATCH v2 1/3] configure: respect --without-curl flag Đoàn Trần Công Danh
2020-03-19  3:58   ` [PATCH v2 2/3] configure: respect --without-expat flag Đoàn Trần Công Danh
2020-03-19  3:58   ` [PATCH v2 3/3] configure: respect --without-openssl flag Đoàn Trần Công Danh
2020-03-26 12:23   ` [PATCH v2 0/3] configure: respect --without-<package> flags Danh Doan
2020-03-27 18:29     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c08bf880c77b7c43256a275e1102308a829d0ee8.1584516715.git.congdanhqx@gmail.com \
    --to=congdanhqx@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).