summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Samuelsson <ulf.samuelsson@atmel.com>2007-11-29 13:06:42 +0000
committerUlf Samuelsson <ulf.samuelsson@atmel.com>2007-11-29 13:06:42 +0000
commit8b78285fde895c8fa9d1b1895d3303dc64109d7b (patch)
tree6071db7a8f1444cf88facb959ecd52899620e069
parent5e10204b08deeb87ba3df3dc1ee850f40b588395 (diff)
Make ipsec-tools depend on packets, instead of selecting them, depend on flex
-rw-r--r--package/ipsec-tools/Config.in6
-rw-r--r--package/ipsec-tools/ipsec-tools.mk4
2 files changed, 6 insertions, 4 deletions
diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in
index 66741417a..982824329 100644
--- 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 be22753c0..05d6eb76c 100644
--- 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)