Merge pull request #1843 from oskar456/aiccugnutls

aiccu: split into default and gnutls variant

ipv6/aiccu/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=aiccu
 PKG_VERSION:=20070115
-PKG_RELEASE:=15
+PKG_RELEASE:=16
 
 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix
@@ -17,28 +17,37 @@ PKG_MD5SUM:=c9bcc83644ed788e22a7c3f3d4021350
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=doc/LICENSE
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/aiccu
+define Package/aiccu/Default
+  TITLE:=SixXS IPv6 Connectivity Client ($(1))
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+libpthread +ip +kmod-sit +kmod-tun +libgnutls
-  TITLE:=SixXS Automatic IPv6 Connectivity Client Utility
+  VARIANT:=$(2)
+  DEPENDS:=+libpthread +ip +kmod-sit +kmod-tun $(3)
   URL:=http://www.sixxs.net/tools/aiccu/
   MAINTAINER:=Ondrej Caletka <ondrej@caletka.cz>
 endef
 
+Package/aiccu=$(call Package/aiccu/Default,without GNUTLS support,default)
+Package/aiccu-gnutls=$(call Package/aiccu/Default,with GNUTLS support,gnutls,+libgnutls)
+
 define Build/Configure
 	$(SED) "s,strip,/bin/true," $(PKG_BUILD_DIR)/unix-console/Makefile
 endef
 
+ifeq ($(BUILD_VARIANT),gnutls)
+CONFIG_AICCU_GNUTLS:=y
+endif
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" OS_NAME="Linux" OS_VERSION="$(LINUX_VERSION)" HAVE_GNUTLS=1 \
+		CC="$(TARGET_CC)" OS_NAME="Linux" OS_VERSION="$(LINUX_VERSION)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		EXTRA_LDFLAGS="$(TARGET_LDFLAGS) -pthread" \
+		$(if $(CONFIG_AICCU_GNUTLS),HAVE_GNUTLS=1) \
 		DEBUG=0
 endef
 
@@ -46,6 +55,8 @@ define Package/aiccu/conffiles
 /etc/config/aiccu
 endef
 
+Package/aiccu-gnutls/conffiles=$(call Package/aiccu/conffiles)
+
 define Package/aiccu/install
 	$(INSTALL_DIR) $(1)/usr/sbin $(1)/lib/netifd/proto $(1)/etc/hotplug.d/ntp
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/
@@ -53,4 +64,7 @@ define Package/aiccu/install
 	$(INSTALL_DATA) ./files/aiccu.hotplug $(1)/etc/hotplug.d/ntp/10-aiccu
 endef
 
+Package/aiccu-gnutls/install=$(call Package/aiccu/install,$(1))
+
 $(eval $(call BuildPackage,aiccu))
+$(eval $(call BuildPackage,aiccu-gnutls))