From: Junio C Hamano <gitster@pobox.com>
To: "Дилян Палаузов" <git-dpa@aegee.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] ./configure.ac: Detect SSL in libcurl using curl-config
Date: Tue, 28 Jun 2016 09:32:20 -0700 [thread overview]
Message-ID: <xmqqeg7h9svf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160628120434.28105-1-git-dpa@aegee.org> ("Дилян Палаузов"'s message of "Tue, 28 Jun 2016 12:04:34 +0000")
Дилян Палаузов <git-dpa@aegee.org> writes:
> The API of libcurl does not mention Curl_ssl_init() and when curl is built
> with -flto, the Curl_ssl_init symbol is not exported.
>
> https://curl.haxx.se/libcurl/using/ suggests calling
> curl-config --feature | grep SSL
> to see, if the installed curl has SSL support. Another approach would
> be calling curl_version_info and checking the returned struct.
>
> This patch removes the check for the Curl_ssl_init exported symbol from
> libcurl and uses curl-config to detect SSL support in libcurl.
>
> Signed-Off-By: Дилян Палаузов <git-dpa@aegee.org>
> ---
This is a tangent, but the patch made me notice [*1*] that a user
cannot build Git without libcurl support if curl is installed on the
system, with something like:
$ ./configure NO_CURL=NoThanks
I do not know if that is a problem (it certainly is NOT a new
problem introduced by your change).
Anyway, will queue.
Thanks.
[Footnote]
*1* The updated code does not have any branch based on $NO_CURL the
original used to have, even though it does branch on
$NO_OPENSSL, which is why I got curious.
> configure.ac | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index c279025..5e9ba59 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -528,16 +528,6 @@ AC_CHECK_LIB([curl], [curl_global_init],
> [NO_CURL=],
> [NO_CURL=YesPlease])
>
> -if test -z "${NO_CURL}" && test -z "${NO_OPENSSL}"; then
> -
> -AC_CHECK_LIB([curl], [Curl_ssl_init],
> -[NEEDS_SSL_WITH_CURL=YesPlease],
> -[NEEDS_SSL_WITH_CURL=])
> -
> -GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
> -
> -fi
> -
> GIT_UNSTASH_FLAGS($CURLDIR)
>
> GIT_CONF_SUBST([NO_CURL])
> @@ -550,6 +540,17 @@ AC_CHECK_PROG([CURL_CONFIG], [curl-config],
>
> if test $CURL_CONFIG != no; then
> GIT_CONF_SUBST([CURL_CONFIG])
> + if test -z "${NO_OPENSSL}"; then
> + AC_MSG_CHECKING([if Curl supports SSL])
> + if test $(curl-config --features|grep SSL) = SSL; then
> + NEEDS_SSL_WITH_CURL=YesPlease
> + AC_MSG_RESULT([yes])
> + else
> + NEEDS_SSL_WITH_CURL=
> + AC_MSG_RESULT([no])
> + fi
> + GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
> + fi
> fi
>
> fi
prev parent reply other threads:[~2016-06-28 16:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-28 12:04 [PATCH] ./configure.ac: Detect SSL in libcurl using curl-config Дилян Палаузов
2016-06-28 16:32 ` Junio C Hamano [this message]
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=xmqqeg7h9svf.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git-dpa@aegee.org \
--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).