From 05554f1747bbc2b358819ced2b9d674be6d21db7 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Thu, 18 Apr 2013 01:47:21 +0000 Subject: quagga: fix build breakage without snmp Quagga no longer supports explicitly disabling snmp, and what's worse, it interprets --disable-snmp as --enable-snmp. Remove the disable configure option. While at it add a comment about net-snmp requiring AgentX support for quagga to build properly as suggested by Arnout. Fixes: http://autobuild.buildroot.net/results/a9bce6dd8065ddb1850a4e14f0e4eb257ee89286/ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/quagga/Config.in | 3 +++ package/quagga/quagga.mk | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/quagga/Config.in b/package/quagga/Config.in index 0834201d4..c364ae1b4 100644 --- a/package/quagga/Config.in +++ b/package/quagga/Config.in @@ -84,4 +84,7 @@ config BR2_PACKAGE_QUAGGA_SNMP help Make quagga information available via SNMP SMUX. +comment "AgentX support must be enabled in net-snmp or the build will break" + depends on BR2_PACKAGE_QUAGGA_SNMP + endif diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk index 42f8506b2..347ec4ddb 100644 --- a/package/quagga/quagga.mk +++ b/package/quagga/quagga.mk @@ -26,10 +26,8 @@ QUAGGA_CONF_OPT += $(if $(BR2_PACKAGE_QUAGGA_OPAQUE_LSA),--enable-opaque-lsa,--d ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config -QUAGGA_CONF_OPT += --enable-snmp +QUAGGA_CONF_OPT += --enable-snmp=agentx QUAGGA_DEPENDENCIES += netsnmp -else -QUAGGA_CONF_OPT +=--disable-snmp endif $(eval $(autotools-package)) -- cgit v1.2.3