Minor tweeks.

svn path=/trunk/; revision=22674
This commit is contained in:
Anders Broman 2007-08-26 21:01:13 +00:00
parent 42d99d2724
commit c2c385fc9f
2 changed files with 11 additions and 7 deletions

View File

@ -175,7 +175,7 @@ ZLIB_DIR=$(WIRESHARK_LIBS)\zlib123
# If you don't have Net-SNMP, comment this line out, so that NET_SNMP_DIR
# isn't defined.
#
NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.4
#NET_SNMP_DIR=$(WIRESHARK_LIBS)\net-snmp-5.4
#
# Optional: the ADNS library enables asynchronous (nonblocking) DNS

View File

@ -74,6 +74,10 @@
#include <lua.h>
#endif
#ifdef HAVE_LIBSMI
#include <smi.h>
#endif
#ifdef SVNVERSION
const char *wireshark_svnversion = " (" SVNVERSION ")";
#else
@ -189,14 +193,14 @@ get_epan_compiled_version_info(GString *str)
/* SNMP */
g_string_append(str, ", ");
#ifdef HAVE_NET_SNMP
g_string_append(str, "with Net-SNMP ");
g_string_append(str, netsnmp_get_version());
#ifdef HAVE_LIBSMI
g_string_append(str, "with SMI ");
g_string_append(str, SMI_VERSION_STRING);
#else /* no SNMP library */
g_string_append(str, "without Net-SNMP");
#endif /* HAVE_NET_SNMP */
g_string_append(str, "without SMI");
#endif /* _SMI_H */
/* ADNS */
/* ADNS */
g_string_append(str, ", ");
#ifdef HAVE_GNU_ADNS
g_string_append(str, "with ADNS");