Commit 8b78285f authored by Ulf Samuelsson's avatar Ulf Samuelsson
Browse files

Make ipsec-tools depend on packets, instead of selecting them, depend on flex

parent 5e10204b

package/ipsec-tools/Config.in

+4 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_IPSEC_TOOLS

	bool "ipsec-tools"

	default n

	select BR2_PACKAGE_OPENSSL

	select BR2_PACKAGE_FLEX

	depends BR2_PACKAGE_OPENSSL && BR2_PACKAGE_FLEX && BR2_PACKAGE_FLEX_LIBFL

	help

	  This package is required to support IPSec for Linux 2.6+



comment "ipsec-tools	- disabled (requires openssl, flex and the flex library (libfl.a) )"

	depends on !BR2_PACKAGE_OPENSSL || !BR2_PACKAGE_FLEX



config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT

	default y

	depends on BR2_PACKAGE_IPSEC_TOOLS

package/ipsec-tools/ipsec-tools.mk

+2 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ $(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_SETKEY) \ 
$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOON) \

$(IPSEC_TOOLS_DIR)/$(IPSEC_TOOLS_BINARY_RACOONCTL): \

    $(IPSEC_TOOLS_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(IPSEC_TOOLS_DIR)

	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPSEC_TOOLS_DIR)



$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_SETKEY) \

$(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOON) \
@@ -135,7 +135,7 @@ ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT)), y) 
IPSEC_TOOLS_PROGS+= $(TARGET_DIR)/$(IPSEC_TOOLS_TARGET_BINARY_RACOONCTL)

endif



ipsec-tools: uclibc openssl $(IPSEC_TOOLS_PROGS)

ipsec-tools: uclibc openssl flex $(IPSEC_TOOLS_PROGS)



ipsec-tools-source: $(DL_DIR)/$(IPSEC_TOOLS_SOURCE)