build: only define HAVE_SNMP

NetSNMP is the only SNMP implementation for Quagga. We don't need two
different symbols.

diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index 86cc0879492511c9f818f2be78b74700a97f3fd5..f6b105631cde911c1be821411f0a4bf1b97197c5 100644 (file)
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -21,14 +21,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include <zebra.h>
 
 #ifdef HAVE_SNMP
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-#else
-#include <asn1.h>
-#include <snmp.h>
-#include <snmp_impl.h>
-#endif
 
 #include "if.h"
 #include "log.h"

diff --git a/configure.ac b/configure.ac
index 80f65b98bcaafcc8818a2bbab95b82a4a58d8620..c3c651f1c314083703f114c57e67f1d9384f58f4 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1370,8 +1370,7 @@ if test "${enable_snmp}" = "yes"; then
         LIBS="${LIBS} -lcrypto";
     fi
     AC_CHECK_LIB(netsnmp, asn_parse_int,
-       [AC_DEFINE(HAVE_NETSNMP,,Net SNMP) 
-        AC_DEFINE(HAVE_SNMP,,SNMP)
+       [AC_DEFINE(HAVE_SNMP,,SNMP)
         LIBS="${LIBS} -lnetsnmp"],
        [AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])])
 

diff --git a/lib/smux.c b/lib/smux.c
index b7cd18d14d644a7a35fba38eae9b7d6711e9fbba..145ec90bba03ab1b7679c57f6917ea70f300cddf 100644 (file)
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -22,14 +22,8 @@
 #include <zebra.h>
 
 #ifdef HAVE_SNMP
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-#else
-#include <asn1.h>
-#include <snmp.h>
-#include <snmp_impl.h>
-#endif
 
 #include "log.h"
 #include "thread.h"

diff --git a/ospf6d/ospf6_snmp.c b/ospf6d/ospf6_snmp.c
index 5ac7846d2247701033f8637d6af0bc98abbb0668..11b733b8cda0c6fb8126e3d1ad1467c2aaa2837a 100644 (file)
--- a/ospf6d/ospf6_snmp.c
+++ b/ospf6d/ospf6_snmp.c
@@ -23,14 +23,8 @@
 
 #ifdef HAVE_SNMP
 
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-#else
-#include <asn1.h>
-#include <snmp.h>
-#include <snmp_impl.h>
-#endif
 
 #include "log.h"
 #include "vty.h"

diff --git a/ospfd/ospf_snmp.c b/ospfd/ospf_snmp.c
index 9c9dd47a759ec74536e77b2406d46960c7eb1a11..739dcae1cdeacffb0f80a7929ff0f72d4df85177 100644 (file)
--- a/ospfd/ospf_snmp.c
+++ b/ospfd/ospf_snmp.c
@@ -25,14 +25,8 @@
 #include <zebra.h>
 
 #ifdef HAVE_SNMP
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-#else
-#include <asn1.h>
-#include <snmp.h>
-#include <snmp_impl.h>
-#endif
 
 #include "if.h"
 #include "log.h"

diff --git a/ripd/rip_snmp.c b/ripd/rip_snmp.c
index 61c47c71d9471f90a42358406d9afe0ac1c5a135..803ac856a19de35d568120cce88e0c4d3899328b 100644 (file)
--- a/ripd/rip_snmp.c
+++ b/ripd/rip_snmp.c
@@ -22,14 +22,8 @@
 #include <zebra.h>
 
 #ifdef HAVE_SNMP
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-#else
-#include <asn1.h>
-#include <snmp.h>
-#include <snmp_impl.h>
-#endif
 
 #include "if.h"
 #include "log.h"

diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
index 0fde4bb818f8859db7ce3f2ea43109271f999fbb..3dbfb5875192956c074bf7cb66cc6429bc2e1e10 100644 (file)
--- a/zebra/zebra_snmp.c
+++ b/zebra/zebra_snmp.c
@@ -22,14 +22,8 @@
 #include <zebra.h>
 
 #ifdef HAVE_SNMP
-#ifdef HAVE_NETSNMP
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
-#else
-#include <asn1.h>
-#include <snmp.h>
-#include <snmp_impl.h>
-#endif
 
 #include "if.h"
 #include "log.h"