diff options
| author | Guy Harris <guy@alum.mit.edu> | 2006-12-09 22:34:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2006-12-09 22:34:13 +0000 |
| commit | a9023649b217e8de470493287d483106da2c48db (patch) | |
| tree | e3dfc235a4ec3aeb282c754cc1729beb6e6547bf /version_info.c | |
| parent | 2a99a93c646c60d73bb7a6461362928aa3691fff (diff) | |
Fix the display of whether the program was built with Net-SNMP, now that
we no longer support UCD SNMP and no longer define HAVE_SOME_SNMP.
svn path=/trunk/; revision=20084
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/version_info.c b/version_info.c index 179f3b14e1..7ef063cea4 100644 --- a/version_info.c +++ b/version_info.c @@ -40,18 +40,10 @@ #include <pcre.h> /* to get the libpcre version number */ #endif /* HAVE_LIBPCRE */ -#ifdef HAVE_SOME_SNMP - #ifdef HAVE_NET_SNMP #include <net-snmp/version.h> #endif /* HAVE_NET_SNMP */ -#ifdef HAVE_UCD_SNMP -#include <ucd-snmp/version.h> -#endif /* HAVE_UCD_SNMP */ - -#endif /* HAVE_SOME_SNMP */ - #if (defined(HAVE_LIBGCRYPT) || defined(HAVE_LIBGNUTLS)) && defined(_WIN32) #include <winposixtype.h> #endif @@ -197,23 +189,12 @@ get_epan_compiled_version_info(GString *str) /* SNMP */ g_string_append(str, ", "); -/* Oh, this is pretty. */ -/* Oh, ha. you think that was pretty. Try this:! --Wes */ -#ifdef HAVE_SOME_SNMP - -#ifdef HAVE_UCD_SNMP - g_string_append(str, "with UCD-SNMP "); - g_string_append(str, VersionInfo); -#endif /* HAVE_UCD_SNMP */ - #ifdef HAVE_NET_SNMP g_string_append(str, "with Net-SNMP "); g_string_append(str, netsnmp_get_version()); -#endif /* HAVE_NET_SNMP */ - #else /* no SNMP library */ g_string_append(str, "without UCD-SNMP or Net-SNMP"); -#endif /* HAVE_SOME_SNMP */ +#endif /* HAVE_NET_SNMP */ /* ADNS */ g_string_append(str, ", "); |