summaryrefslogtreecommitdiff
path: root/epan/epan.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-06-23 14:55:56 -0700
committerGuy Harris <guy@alum.mit.edu>2014-06-23 21:56:42 +0000
commit1d92195de847a30e570ca690ab0a2034cb3a51d3 (patch)
tree95b000735679f0b957b8c9eecc9ad4d700ea4efc /epan/epan.c
parentdd7134d907350ccc574cdec596f4162860912bb9 (diff)
downloadwireshark-1d92195de847a30e570ca690ab0a2034cb3a51d3.tar.gz
Have individual programs get libpcap and libz version info.
That way, the code that constructs the runtime version string doesn't itself have to call libpcap and libz, and could be usable in programs that don't call them. While we're at it, add "with" to the run-time version information for GnuTLS and libgcrypt, to match the compile-time version information, and add the version information from libwireshark to TShark. Change-Id: I3726a027d032270b032292da9314c1cec535dcd2 Reviewed-on: https://code.wireshark.org/review/2587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/epan.c')
-rw-r--r--epan/epan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/epan.c b/epan/epan.c
index eef9880f3e..2d5ebfe21d 100644
--- a/epan/epan.c
+++ b/epan/epan.c
@@ -549,12 +549,12 @@ _U_
{
/* GnuTLS */
#ifdef HAVE_LIBGNUTLS
- g_string_append_printf(str, ", GnuTLS %s", gnutls_check_version(NULL));
+ g_string_append_printf(str, ", with GnuTLS %s", gnutls_check_version(NULL));
#endif /* HAVE_LIBGNUTLS */
/* Gcrypt */
#ifdef HAVE_LIBGCRYPT
- g_string_append_printf(str, ", Gcrypt %s", gcry_check_version(NULL));
+ g_string_append_printf(str, ", with Gcrypt %s", gcry_check_version(NULL));
#endif /* HAVE_LIBGCRYPT */
}