keepalived: add missing CONFIG_ prefix to PKG_CONFIG_DEPENDS elements

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 209bcc649a)

net/keepalived/Makefile

@@ -21,21 +21,21 @@ PKG_LICENSE_FILES:=COPYING
 PKG_MAINTAINER:=Ben Kelly <ben@benjii.net> \
 		Florian Eckert <fe@dev.tdt.de>
 
-PKG_CONFIG_DEPENDS += \
-	KEEPALIVED_NFTABLES \
-	KEEPALIVED_VRRP \
-	KEEPALIVED_LVS \
-	KEEPALIVED_IPTABLES \
-	KEEPALIVED_BFD \
-	KEEPALIVED_SNMP_VRRP \
-	KEEPALIVED_SNMP_CHECKER \
-	KEEPALIVED_SNMP_RFC2 \
-	KEEPALIVED_SNMP_RFC3 \
-	KEEPALIVED_SNMP_REPLY_V3_FOR_V2 \
-	KEEPALIVED_DBUS \
-	KEEPALIVED_JSON \
-	KEEPALIVED_ROUTES \
-	IPV6
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_KEEPALIVED_NFTABLES \
+	CONFIG_KEEPALIVED_VRRP \
+	CONFIG_KEEPALIVED_LVS \
+	CONFIG_KEEPALIVED_IPTABLES \
+	CONFIG_KEEPALIVED_BFD \
+	CONFIG_KEEPALIVED_SNMP_VRRP \
+	CONFIG_KEEPALIVED_SNMP_CHECKER \
+	CONFIG_KEEPALIVED_SNMP_RFC2 \
+	CONFIG_KEEPALIVED_SNMP_RFC3 \
+	CONFIG_KEEPALIVED_SNMP_REPLY_V3_FOR_V2 \
+	CONFIG_KEEPALIVED_DBUS \
+	CONFIG_KEEPALIVED_JSON \
+	CONFIG_KEEPALIVED_ROUTES \
+	CONFIG_IPV6
 
 PKG_INSTALL:=1
 
@@ -46,11 +46,6 @@ define Package/keepalived/config
 	source "$(SOURCE)/Config.in"
 endef
 
-# specifying +(IPV6&&KEEPALIVED_IPTABLES) in the DEPENDS definition doesn't work
-ifeq ($(CONFIG_KEEPALIVED_IPTABLES)$(CONFIG_IPV6),yy)
-  KEEPALIVED_DEPENDS_LIBIP6TC=+libip6tc
-endif
-
 # The +kmod-nf-ipvs line should be +KEEPALIVED_LVS:kmod-nf-ipvs,
 # but make menuconfig then reports :error: recursive dependency detected!
 # !!FIXME DEPENDS:= +KEEPALIVED_LVS:kmod-nf-ipvs
@@ -69,7 +64,7 @@ define Package/keepalived
     +KEEPALIVED_VRRP:libnfnetlink \
     +KEEPALIVED_SHA1:libopenssl \
     +KEEPALIVED_IPTABLES:libip4tc \
-    $(KEEPALIVED_DEPENDS_LIBIP6TC) \
+    +(KEEPALIVED_IPTABLES&&IPV6):libip6tc \
     +KEEPALIVED_IPTABLES:libxtables \
     +KEEPALIVED_IPTABLES:libipset \
     +(KEEPALIVED_SNMP_VRRP||KEEPALIVED_SNMP_CHECKER||KEEPALIVED_SNMP_RFC2||KEEPALIVED_SNMP_RFC3):libnetsnmp \