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.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20084 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/version_info.c b/version_info.c
index 179f3b14e19a7610715a606d464d3369d215e2f0..7ef063cea4f92444bed212d8e3412923b2c86cda 100644 (file)
--- 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, ", ");