osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

display runtime versions of GnuTLS and Gcrypt libraries 

svn path=/trunk/; revision=27194
This commit is contained in:
Tomas Kukosa 2009-01-08 13:24:04 +00:00
parent ff602b6a2a
commit e22d7c79eb
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.nmake
View File

@ -60,6 +60,7 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib shell32.lib comctl32.lib \
$(HHC_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
!ELSE
@ -71,14 +72,14 @@ wireshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
$(C_ARES_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
$(GNUTLS_LIBS)
$(ZLIB_LIBS)
!ENDIF
tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
!ELSE
@ -90,14 +91,14 @@ tshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
$(C_ARES_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
$(GNUTLS_LIBS)
$(ZLIB_LIBS)
!ENDIF
rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
!ELSE
@ -109,8 +110,7 @@ rawshark_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
$(C_ARES_LIBS) \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
$(GNUTLS_LIBS)
$(ZLIB_LIBS)
!ENDIF
capinfos_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
@ -136,12 +136,14 @@ text2pcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
dumpcap_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
wsutil\libwsutil.lib \
$(GLIB_LIBS)
$(GLIB_LIBS) \
$(GNUTLS_LIBS)
dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
wsock32.lib user32.lib \
$(GLIB_LIBS) \
wsutil\libwsutil.lib \
$(GNUTLS_LIBS) \
!IFDEF ENABLE_LIBWIRESHARK
epan\libwireshark.lib \
!ELSE
@ -152,8 +154,7 @@ dftest_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \
$(ADNS_LIBS) \
$(PCRE_LIBS) \
$(ZLIB_LIBS) \
$(SMI_LIBS) \
$(GNUTLS_LIBS)
$(SMI_LIBS)
!ENDIF
randpkt_LIBS= wiretap\wiretap-$(WTAP_VERSION).lib \

10
version_info.c
View File

@ -492,6 +492,16 @@ get_runtime_version_info(GString *str, void (*additional_info)(GString *))
g_string_append(str, ", ");
get_runtime_pcap_version(str);
/* GnuTLS */
#ifdef HAVE_LIBGNUTLS
g_string_append_printf(str, ", GnuTLS %s", gnutls_check_version(NULL));
#endif /* HAVE_LIBGNUTLS */
/* Gcrypt */
#ifdef HAVE_LIBGCRYPT
g_string_append_printf(str, ", Gcrypt %s", gcry_check_version(NULL));
#endif /* HAVE_LIBGCRYPT */
/* Additional application-dependent information */
if (additional_info)
(*additional_info)(str);