diff options
| author | Vincent Bernat <bernat@luffy.cx> | 2012-05-22 22:15:20 +0200 |
|---|---|---|
| committer | Vincent Bernat <bernat@luffy.cx> | 2012-06-25 19:03:23 +0200 |
| commit | 6b1e37f8537fa2a4560de32e83ca5089763e2d39 (patch) | |
| tree | 941dfbfbe62981ec214ac1e5a3f607368f4bf1d4 | |
| parent | 9e7a548ce421660b0d22bfeb90c2b2b53742aac7 (diff) | |
build: only define HAVE_SNMP
NetSNMP is the only SNMP implementation for Quagga. We don't need two
different symbols.
| -rw-r--r-- | bgpd/bgp_snmp.c | 6 | ||||
| -rwxr-xr-x | configure.ac | 3 | ||||
| -rw-r--r-- | lib/smux.c | 6 | ||||
| -rw-r--r-- | ospf6d/ospf6_snmp.c | 6 | ||||
| -rw-r--r-- | ospfd/ospf_snmp.c | 6 | ||||
| -rw-r--r-- | ripd/rip_snmp.c | 6 | ||||
| -rw-r--r-- | zebra/zebra_snmp.c | 6 |
7 files changed, 1 insertions, 38 deletions
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 86cc0879..f6b10563 100644 --- 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 80f65b98..c3c651f1 100755 --- 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])]) @@ -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 5ac7846d..11b733b8 100644 --- 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 9c9dd47a..739dcae1 100644 --- 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 61c47c71..803ac856 100644 --- 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 0fde4bb8..3dbfb587 100644 --- 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" |