proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 18:27:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: only define HAVE_SNMP

Browse Source 
NetSNMP is the only SNMP implementation for Quagga. We don't need two
different symbols.
This commit is contained in:
Vincent Bernat 2012-05-22 22:15:20 +02:00
parent 9e7a548ce4
commit 6b1e37f853
7 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bgpd/bgp_snmp.c
View File

@ -21,14 +21,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include <zebra.h> #include <zebra.h>
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h> #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"

3
configure.ac
View File

@ -1370,8 +1370,7 @@ if test "${enable_snmp}" = "yes"; then
LIBS="${LIBS} -lcrypto"; LIBS="${LIBS} -lcrypto";
fi fi
AC_CHECK_LIB(netsnmp, asn_parse_int, 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"], LIBS="${LIBS} -lnetsnmp"],
[AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])]) [AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])])

6
lib/smux.c
View File

@ -22,14 +22,8 @@
#include <zebra.h> #include <zebra.h>
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h> #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
#endif
#include "log.h" #include "log.h"
#include "thread.h" #include "thread.h"

6
ospf6d/ospf6_snmp.c
View File

@ -23,14 +23,8 @@
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h> #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
#endif
#include "log.h" #include "log.h"
#include "vty.h" #include "vty.h"

6
ospfd/ospf_snmp.c
View File

@ -25,14 +25,8 @@
#include <zebra.h> #include <zebra.h>
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h> #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"

6
ripd/rip_snmp.c
View File

@ -22,14 +22,8 @@
#include <zebra.h> #include <zebra.h>
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h> #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"

6
zebra/zebra_snmp.c
View File

@ -22,14 +22,8 @@
#include <zebra.h> #include <zebra.h>
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#ifdef HAVE_NETSNMP
#include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h> #include <net-snmp/net-snmp-includes.h>
#else
#include <asn1.h>
#include <snmp.h>
#include <snmp_impl.h>
#endif
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"