Browse Source

dnsmasq: make tftp support optional

Peter Korsgaard 17 years ago
parent
commit
ecd6931abe
2 changed files with 16 additions and 6 deletions
  1. 8 0
      package/dnsmasq/Config.in
  2. 8 6
      package/dnsmasq/dnsmasq.mk

+ 8 - 0
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.
+

+ 8 - 6
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: