summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-10-03 21:47:18 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-10-03 22:01:08 +0200
commit0d6bea5119e25ee3c331ab27b30886cceee11aa1 (patch)
tree641db3f53d79b9a46f4ce4cbb115f4faab9e5a4b
parent1be5730aa2bc51cbe1deca6282b22fa20306d47c (diff)
quagga: snmp support needs netsnmp
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/quagga/Config.in1
-rw-r--r--package/quagga/quagga.mk5
2 files changed, 5 insertions, 1 deletions
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index e1a5c7371..e540cc608 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -59,6 +59,7 @@ config BR2_PACKAGE_QUAGGA_NETLINK
config BR2_PACKAGE_QUAGGA_SNMP
bool "SNMP support"
+ select BR2_PACKAGE_NETSNMP
config BR2_PACKAGE_QUAGGA_TCP_ZEBRA
bool "TCP/IP socket connection between zebra and proto daemon"
diff --git a/package/quagga/quagga.mk b/package/quagga/quagga.mk
index fb520eeba..d2f0616c6 100644
--- a/package/quagga/quagga.mk
+++ b/package/quagga/quagga.mk
@@ -10,6 +10,8 @@ QUAGGA_DIR:=$(BUILD_DIR)/quagga-$(QUAGGA_VERSION)
QUAGGA_CAT:=$(ZCAT)
QUAGGA_CONFIGURE:=
+QUAGGA_DEPENDENCIES:=
+
ifeq ($(BR2_PACKAGE_QUAGGA_ZEBRA),y)
QUAGGA_CONFIGURE+=--enable-zebra
ifndef QUAGGA_TARGET_BINARY
@@ -96,6 +98,7 @@ QUAGGA_CONFIGURE+=--disable-netlink
endif
ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y)
QUAGGA_CONFIGURE+=--enable-snmp
+QUAGGA_DEPENDENCIES+=netsnmp
else
QUAGGA_CONFIGURE+=--disable-snmp
endif
@@ -163,7 +166,7 @@ ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(TARGET_DIR)/usr/info
endif
-quagga: $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY)
+quagga: $(QUAGGA_DEPENDENCIES) $(TARGET_DIR)/usr/sbin/$(QUAGGA_TARGET_BINARY)
quagga-clean:
-$(MAKE) DESTDIR=$(TARGET_DIR) -C $(QUAGGA_DIR) uninstall