[Astlinux-commits] SF.net SVN: astlinux:[6050] branches/1.0/package/dnsmasq/dnsmasq.mk

[<abe...@us...>]

Revision: 6050
          http://sourceforge.net/p/astlinux/code/6050
Author:   abelbeck
Date:     2013-04-20 18:10:01 +0000 (Sat, 20 Apr 2013)
Log Message:
-----------
dnsmasq, version bump to 2.66

Modified Paths:
--------------
    branches/1.0/package/dnsmasq/dnsmasq.mk

Modified: branches/1.0/package/dnsmasq/dnsmasq.mk
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.mk	2013-04-20 16:38:31 UTC (rev 6049)
+++ branches/1.0/package/dnsmasq/dnsmasq.mk	2013-04-20 18:10:01 UTC (rev 6050)
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-DNSMASQ_VERSION = 2.65
+DNSMASQ_VERSION = 2.66
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
-DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
+DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
 DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
 
@@ -53,9 +53,22 @@
 endef
 endif
 
+ifeq ($(BR2_PACKAGE_IPSET),y)
+define DNSMASQ_ENABLE_IPSET
+	$(SED) 's^.*#define HAVE_IPSET.*^#define HAVE_IPSET^' \
+		$(DNSMASQ_DIR)/src/config.h
+endef
+else
+define DNSMASQ_ENABLE_IPSET
+	$(SED) 's^.*#define HAVE_IPSET.*^/* #define HAVE_IPSET */^' \
+		$(DNSMASQ_DIR)/src/config.h
+endef
+endif
+
 define DNSMASQ_BUILD_CMDS
 	$(DNSMASQ_FIX_PKGCONFIG)
 	$(DNSMASQ_ENABLE_DBUS)
+	$(DNSMASQ_ENABLE_IPSET)
 	$(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPT)
 endef
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.