diff options
| -rw-r--r-- | bgpd/bgp_snmp.c | 4 | ||||
| -rwxr-xr-x | configure.ac | 28 | ||||
| -rw-r--r-- | lib/smux.c | 4 | ||||
| -rw-r--r-- | ospf6d/ospf6_snmp.c | 5 | ||||
| -rw-r--r-- | ospfd/ospf_snmp.c | 4 | ||||
| -rw-r--r-- | ripd/rip_snmp.c | 4 | ||||
| -rw-r--r-- | zebra/zebra_snmp.c | 4 |
7 files changed, 28 insertions, 25 deletions
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c index 3d26890e..576e3e09 100644 --- a/bgpd/bgp_snmp.c +++ b/bgpd/bgp_snmp.c @@ -23,10 +23,12 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA #ifdef HAVE_SNMP #ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> -#endif +#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 87ec96c4..547b6866 100755 --- a/configure.ac +++ b/configure.ac @@ -206,6 +206,8 @@ AC_ARG_ENABLE(netlink, [ --enable-netlink force to use Linux netlink interface]) AC_ARG_ENABLE(broken-aliases, [ --enable-broken-aliases enable aliases as distinct interfaces for Linux 2.2.X]) +AC_ARG_WITH(crypto, +[ --without-crypto do not use libcrypto in SNMP]) AC_ARG_ENABLE(snmp, [ --enable-snmp enable SNMP support]) AC_ARG_WITH(libpam, @@ -1254,29 +1256,19 @@ dnl ------------------ dnl check Net-SNMP library dnl ------------------ if test "${enable_snmp}" = "yes"; then - LIBS="${LIBS} -lcrypto" + if test "$with_crypto" != "no"; then + LIBS="${LIBS} -lcrypto"; + fi AC_CHECK_LIB(netsnmp, asn_parse_int, [AC_DEFINE(HAVE_NETSNMP,,Net SNMP) AC_DEFINE(HAVE_SNMP,,SNMP) LIBS="${LIBS} -lnetsnmp"], [AC_MSG_ERROR([--enable-snmp given, but cannot find support for SNMP])]) - - for ac_snmp in /usr/include \ - /usr/local/include \ - /dev/null; do - test -f "${ac_snmp}/net-snmp/library/asn1.h" && break - done - - case ${ac_snmp} in - /dev/null) - AC_MSG_ERROR([--enable-snmp given, but can not find header]) - ;; - *) - SNMP_INCLUDES="-I${ac_snmp}/net-snmp" - SNMP_INCLUDES="${SNMP_INCLUDES} -I${ac_snmp}/net-snmp/library" - ;; - esac - + + AC_CHECK_HEADER([net-snmp/net-snmp-config.h], + [], + [AC_MSG_ERROR([--enable-snmp given, but cannot find net-snmp-config.h])], + QUAGGA_INCLUDES) AC_SUBST(SNMP_INCLUDES) fi @@ -24,10 +24,12 @@ #ifdef HAVE_SNMP #ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> -#endif +#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 a1d8d4c9..8d9842ce 100644 --- a/ospf6d/ospf6_snmp.c +++ b/ospf6d/ospf6_snmp.c @@ -25,11 +25,12 @@ #ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> -#endif /*HAVE_NETSNMP*/ - +#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 6e972605..e6ce1f01 100644 --- a/ospfd/ospf_snmp.c +++ b/ospfd/ospf_snmp.c @@ -27,10 +27,12 @@ #ifdef HAVE_SNMP #ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> -#endif +#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 c1bec762..d02c7610 100644 --- a/ripd/rip_snmp.c +++ b/ripd/rip_snmp.c @@ -24,10 +24,12 @@ #ifdef HAVE_SNMP #ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> -#endif +#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 4536026f..7e66e2f6 100644 --- a/zebra/zebra_snmp.c +++ b/zebra/zebra_snmp.c @@ -24,10 +24,12 @@ #ifdef HAVE_SNMP #ifdef HAVE_NETSNMP #include <net-snmp/net-snmp-config.h> -#endif +#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" |