From: "Randall S. Becker" <the.n.e.key@gmail.com>
To: git@vger.kernel.org
Cc: "Randall S. Becker" <randall.becker@nexbridge.ca>,
"Randall S . Becker" <rsbecker@nexbridge.com>
Subject: [PATCH v0 1/1] Teach git version --build-options about zlib+libcurl
Date: Fri, 21 Jun 2024 11:45:52 -0400 [thread overview]
Message-ID: <20240621154552.62038-2-randall.becker@nexbridge.ca> (raw)
In-Reply-To: <20240621154552.62038-1-randall.becker@nexbridge.ca>
This change uses the zlib supplied ZLIB_VERSION #define supplied text
macro and the libcurl LIBCURL_VERSION #define text macro. No
stringification is required for either variable's use. If either of
the #define is not present, that version is not reported.
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
---
help.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/help.c b/help.c
index 1d057aa607..f378750af4 100644
--- a/help.c
+++ b/help.c
@@ -1,4 +1,5 @@
#include "git-compat-util.h"
+#include "git-curl-compat.h"
#include "config.h"
#include "builtin.h"
#include "exec-cmd.h"
@@ -757,6 +758,12 @@ 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 ZLIB_VERSION
+ strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION);
+#endif
}
}
--
2.43.0
next prev parent reply other threads:[~2024-06-21 15:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-21 15:45 [PATCH v0 0/1] Teach git version --build-options about zlib+libcurl Randall S. Becker
2024-06-21 15:45 ` Randall S. Becker [this message]
2024-06-21 18:20 ` [PATCH v0 1/1] " Junio C Hamano
2024-06-21 18:28 ` Junio C Hamano
2024-06-21 18:33 ` rsbecker
2024-06-21 18:58 ` Junio C Hamano
2024-06-21 19:20 ` Junio C Hamano
2024-06-21 19:32 ` Randall Becker
2024-06-22 5:11 ` Junio C Hamano
2024-06-25 19:29 ` rsbecker
2024-06-25 20:58 ` Junio C Hamano
2024-06-25 22:02 ` rsbecker
2024-06-26 20:42 ` Jeff King
2024-06-26 22:28 ` Junio C Hamano
2024-06-26 20:46 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240621154552.62038-2-randall.becker@nexbridge.ca \
--to=the.n.e.key@gmail.com \
--cc=git@vger.kernel.org \
--cc=randall.becker@nexbridge.ca \
--cc=rsbecker@nexbridge.com \
/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.
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 NNTP newsgroup(s).