dnsmasq: make tftp support optional

diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index 05e40f34eb7bcc1beb626dc315721ab9d5cb8e9f..ddf478240531c9a7c661e5b30c445866de0f512d 100644 (file)
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -6,3 +6,11 @@ config BR2_PACKAGE_DNSMASQ
          coupled DNS and DHCP service to a LAN.
 
          http://www.thekelleys.org.uk/dnsmasq/
+
+config BR2_PACKAGE_DNSMASQ_TFTP
+       bool "tftp support"
+       default y
+       depends on BR2_PACKAGE_DNSMASQ
+       help
+         Enable TFTP support in dnsmasq.
+

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index c209de60ab93c2ea37412ccfe8b78011641b76fa..c5dbefaec9429f517e701d7829c5861cdfa04f28 100644 (file)
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -11,10 +11,14 @@ DNSMASQ_DIR:=$(BUILD_DIR)/dnsmasq-$(DNSMASQ_UPVER)
 DNSMASQ_BINARY:=dnsmasq
 DNSMASQ_TARGET_BINARY:=usr/sbin/dnsmasq
 
-ifneq ($(BR2_INET_IPV6),y)
-DNSMASQ_COPTS:=-DNO_IPV6
-else
 DNSMASQ_COPTS:=
+
+ifneq ($(BR2_INET_IPV6),y)
+DNSMASQ_COPTS+=-DNO_IPV6
+endif
+
+ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y)
+DNSMASQ_COPTS+=-DNO_TFTP
 endif
 
 $(DL_DIR)/$(DNSMASQ_SOURCE):
@@ -27,7 +31,7 @@ $(DNSMASQ_DIR)/.source: $(DL_DIR)/$(DNSMASQ_SOURCE)
 
 $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY): $(DNSMASQ_DIR)/.source
        $(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
-               COPTS=$(DNSMASQ_COPTS) PREFIX=/usr -C $(DNSMASQ_DIR)
+               COPTS='$(DNSMASQ_COPTS)' PREFIX=/usr -C $(DNSMASQ_DIR)
 
 $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY): $(DNSMASQ_DIR)/src/$(DNSMASQ_BINARY)
        $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(DNSMASQ_DIR) install
@@ -41,8 +45,6 @@ endif
 
 dnsmasq: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
 
-dnsmasq1: uclibc $(TARGET_DIR)/$(DNSMASQ_TARGET_BINARY)
-
 dnsmasq-source: $(DL_DIR)/$(DNSMASQ_SOURCE)
 
 dnsmasq-clean: