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

diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 66741417aa0013ef7fe971a663f00c170eda2c4f..98282432993dee04c177f6664a1aceeb3d870ab9 100644 (file)
--- a/package/ipsec-tools/Config.in
+++ b/package/ipsec-tools/Config.in
@@ -1,11 +1,13 @@
 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

diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index be22753c0ab24ece7ddd7c76253a073ad3aa5e36..05d6eb76c27da77623d83c99db6516e28215f773 100644 (file)
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -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)