From: Randall S. Becker <the.n.e.key@gmail.com>
Date: Fri, 21 Jun 2024 18:09:46 +0000 (-0400)
Subject: version: teach --build-options to reports libcurl version information
X-Git-Tag: v2.46.0-rc0~19^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e2203163df8640a9c66de663fd6337ceee710c8;p=thirdparty%2Fgit.git

version: teach --build-options to reports libcurl version information

Show LIBCURL_VERSION, if defined, in "git version --build-options"
output.

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/help.c b/help.c
index ce55aaa2c0..92bfef140b 100644
--- a/help.c
+++ b/help.c
@@ -15,6 +15,10 @@
 #include "prompt.h"
 #include "fsmonitor-ipc.h"
 
+#ifndef NO_CURL
+#include "git-curl-compat.h" /* For LIBCURL_VERSION only */
+#endif
+
 struct category_description {
 	uint32_t category;
 	const char *desc;
@@ -757,6 +761,9 @@ void get_version_info(struct strbuf *buf, int show_build_options)
 
 		if (fsmonitor_ipc__is_supported())
 			strbuf_addstr(buf, "feature: fsmonitor--daemon\n");
+#if defined LIBCURL_VERSION
+		strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION);
+#endif
 #if defined OPENSSL_VERSION_TEXT
 		strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT);
 #endif