The versions of UCD SNMP that we now support all install

<ucd-snmp/version.h>, so get rid of the stuff to check for its presence
and handle its absence.

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

diff --git a/acinclude.m4 b/acinclude.m4
index eddede08d0bb598b49b7733e3d6c114cb692d7dc..cf1f26ff76fb3939cea8467ed3a8ec9c43b93a6c 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
 dnl This file is part of the Autoconf packaging for Ethereal.
 dnl Copyright (C) 1998-2000 by Gerald Combs.
 dnl
-dnl $Id: acinclude.m4,v 1.45 2002/07/06 20:40:42 guy Exp $
+dnl $Id: acinclude.m4,v 1.46 2002/10/25 03:13:07 guy Exp $
 dnl
 dnl This program is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -537,13 +537,6 @@ AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
        #
        AC_CHECK_HEADER(ucd-snmp/snmp.h,
        [
-               #
-               # Yup, we have it.
-               # Do we have <ucd-snmp/version.h>?  It's not required,
-               # but if it's not present we can't report the version number.
-               #
-               AC_CHECK_HEADERS(ucd-snmp/version.h)
-
                #
                # UCD SNMP may require "-lkstat" on Solaris, sigh.
                # XXX - it may also require "-lcrypto" on some platforms;

diff --git a/gtk/main.c b/gtk/main.c
index 67fb06a3f1d2271e31b7ed23615e75c4fd5cff74..0b67b709d2c1a94b53f29b495481fd57e737ebbc 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.270 2002/10/25 01:08:46 guy Exp $
+ * $Id: main.c,v 1.271 2002/10/25 03:13:09 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -65,17 +65,15 @@
 #endif
 
 #ifdef HAVE_SOME_SNMP
+
 #ifdef HAVE_NET_SNMP
 #include <net-snmp/version.h>
-#else /* HAVE_NET_SNMP */
-/*
- * XXX - we no longer support old versions of UCD SNMP; do all the
- * versions we support have, and install, this header?
- */
-#ifdef HAVE_UCD_SNMP_VERSION_H
-#include <ucd-snmp/version.h>
-#endif /* HAVE_UCD_SNMP_VERSION_H */
 #endif /* HAVE_NET_SNMP */
+
+#ifdef HAVE_UCD_SNMP
+#include <ucd-snmp/version.h>
+#endif /* HAVE_UCD_SNMP */
+
 #endif /* HAVE_SOME_SNMP */
 
 #ifdef NEED_STRERROR_H
@@ -1456,11 +1454,7 @@ main(int argc, char *argv[])
 
 #ifdef HAVE_UCD_SNMP
   g_string_append(comp_info_str, ", with UCD-SNMP ");
-#ifdef HAVE_UCD_SNMP_VERSION_H
   g_string_append(comp_info_str, VersionInfo);
-#else /* HAVE_UCD_SNMP_VERSION_H */
-  g_string_append(comp_info_str, "(version unknown)");
-#endif /* HAVE_UCD_SNMP_VERSION_H */
 #endif /* HAVE_UCD_SNMP */
 
 #ifdef HAVE_NET_SNMP

diff --git a/gtk2/main.c b/gtk2/main.c
index 431b37030107a6c9c7b44428457508fdaa78bb4d..96f8a1d9bd4fb4bf554f2c87bdd54273f06d1d01 100644 (file)
--- a/gtk2/main.c
+++ b/gtk2/main.c
@@ -1,6 +1,6 @@
 /* main.c
  *
- * $Id: main.c,v 1.18 2002/10/25 01:08:48 guy Exp $
+ * $Id: main.c,v 1.19 2002/10/25 03:13:11 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -65,17 +65,15 @@
 #endif
 
 #ifdef HAVE_SOME_SNMP
+
 #ifdef HAVE_NET_SNMP
 #include <net-snmp/version.h>
-#else /* HAVE_NET_SNMP */
-/*
- * XXX - we no longer support old versions of UCD SNMP; do all the
- * versions we support have, and install, this header?
- */
-#ifdef HAVE_UCD_SNMP_VERSION_H
-#include <ucd-snmp/version.h>
-#endif /* HAVE_UCD_SNMP_VERSION_H */
 #endif /* HAVE_NET_SNMP */
+
+#ifdef HAVE_UCD_SNMP
+#include <ucd-snmp/version.h>
+#endif /* HAVE_UCD_SNMP */
+
 #endif /* HAVE_SOME_SNMP */
 
 #ifdef NEED_STRERROR_H
@@ -1540,11 +1538,7 @@ main(int argc, char *argv[])
 
 #ifdef HAVE_UCD_SNMP
     g_string_append(comp_info_str, ", with UCD-SNMP ");
-#ifdef HAVE_UCD_SNMP_VERSION_H
     g_string_append(comp_info_str, VersionInfo);
-#else /* HAVE_UCD_SNMP_VERSION_H */
-    g_string_append(comp_info_str, "(version unknown)");
-#endif /* HAVE_UCD_SNMP_VERSION_H */
 #endif /* HAVE_UCD_SNMP */
 
 #ifdef HAVE_NET_SNMP

diff --git a/tethereal.c b/tethereal.c
index 8bc1f4cda4e659a252a41f295ec60f3e85f3c289..97f9a61be9ae0aed3faf9b0d53377de2813b7226 100644 (file)
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.164 2002/10/24 07:08:22 guy Exp $
+ * $Id: tethereal.c,v 1.165 2002/10/25 03:13:07 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -61,17 +61,15 @@
 #endif
 
 #ifdef HAVE_SOME_SNMP
+
 #ifdef HAVE_NET_SNMP
 #include <net-snmp/version.h>
-#else /* HAVE_NET_SNMP */
-/*
- * XXX - we no longer support old versions of UCD SNMP; do all the
- * versions we support have, and install, this header?
- */
-#ifdef HAVE_UCD_SNMP_VERSION_H
-#include <ucd-snmp/version.h>
-#endif /* HAVE_UCD_SNMP_VERSION_H */
 #endif /* HAVE_NET_SNMP */
+
+#ifdef HAVE_UCD_SNMP
+#include <ucd-snmp/version.h>
+#endif /* HAVE_UCD_SNMP */
+
 #endif /* HAVE_SOME_SNMP */
 
 #ifdef NEED_STRERROR_H
@@ -449,11 +447,7 @@ main(int argc, char *argv[])
 
 #ifdef HAVE_UCD_SNMP
   g_string_append(comp_info_str, ", with UCD-SNMP ");
-#ifdef HAVE_UCD_SNMP_VERSION_H
   g_string_append(comp_info_str, VersionInfo);
-#else /* HAVE_UCD_SNMP_VERSION_H */
-  g_string_append(comp_info_str, "(version unknown)");
-#endif /* HAVE_UCD_SNMP_VERSION_H */
 #endif /* HAVE_UCD_SNMP */
 
 #ifdef HAVE_NET_SNMP