git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v2 2/2] Teach git version --build-options about zlib versions.
Date: Fri, 21 Jun 2024 14:09:47 -0400	[thread overview]
Message-ID: <20240621180947.64419-3-randall.becker@nexbridge.ca> (raw)
In-Reply-To: <20240621180947.64419-1-randall.becker@nexbridge.ca>

This change uses the zlib ZLIB_VERSION #define text macro. No
stringification is required for the variable's use. If the #define
is not present, that version is not reported.

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>
---
 help.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/help.c b/help.c
index bf74e935b9..f378750af4 100644
--- a/help.c
+++ b/help.c
@@ -760,6 +760,9 @@ void get_version_info(struct strbuf *buf, int show_build_options)
 			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


  parent reply	other threads:[~2024-06-21 18:10 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-21 18:09 [PATCH v2 0/2] Teach git version --build-options about zlib+libcurl Randall S. Becker
2024-06-21 18:09 ` [PATCH v2 1/2] Teach git version --build-options about libcurl Randall S. Becker
2024-06-24 14:13   ` Johannes Schindelin
2024-06-24 14:33     ` Randall Becker
2024-06-24 17:08       ` Dragan Simic
2024-06-24 21:15         ` rsbecker
2024-06-24 21:52           ` Dragan Simic
2024-06-24 21:56             ` Randall Becker
2024-07-24 10:51       ` Johannes Schindelin
2024-06-24 15:29     ` Jeff King
2024-06-24 16:06     ` Junio C Hamano
2024-06-24 23:55       ` Jeff King
2024-06-25  0:00         ` Junio C Hamano
2024-07-24 10:48         ` Johannes Schindelin
2024-07-24 20:55           ` Jeff King
2024-07-24 22:17             ` Johannes Schindelin
2024-07-25  6:52               ` Jeff King
2024-07-25 15:28                 ` Junio C Hamano
2024-07-26  0:41                   ` Jeff King
2024-06-21 18:09 ` Randall S. Becker [this message]
2024-06-24 14:15   ` [PATCH v2 2/2] Teach git version --build-options about zlib versions Johannes Schindelin
2024-06-24 14:38     ` Randall Becker
2024-07-24 11:02       ` Johannes Schindelin
2024-07-24 13:36         ` Randall Becker
2024-07-24 16:21           ` Junio C Hamano
2024-07-24 16:33             ` rsbecker

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=20240621180947.64419-3-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).