aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-04-03 21:36:01 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-04-03 21:36:01 +0000
commit5d45603b1f279df9f784ee10b4bbc43c2f139a0c (patch)
treedbb92b77cfec4cd15aa4670ceb8511cde1bf635b /package
parentd486b611aca841065dcad5daefb78f59b03bfe81 (diff)
downloadupstream-5d45603b1f279df9f784ee10b4bbc43c2f139a0c.tar.gz
upstream-5d45603b1f279df9f784ee10b4bbc43c2f139a0c.tar.bz2
upstream-5d45603b1f279df9f784ee10b4bbc43c2f139a0c.zip
make lzo and server support in openvpn optional
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@551 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/Makefile4
-rw-r--r--package/openvpn/Config.in12
-rw-r--r--package/openvpn/Makefile10
3 files changed, 25 insertions, 1 deletions
diff --git a/package/Makefile b/package/Makefile
index 9804dedee4..bb378848ff 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -54,6 +54,10 @@ clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean
compile: $(patsubst %,%-compile,$(package-y) $(package-m))
install: $(patsubst %,%-install,$(package-y))
+ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+openvpn-compile: lzo-compile
+endif
+
nocatsplash-compile: glib-compile
arpwatch-compile: libpcap-compile
tcpdump-compile: libpcap-compile
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 442313fff6..873e61b9d4 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -3,8 +3,18 @@ config BR2_PACKAGE_OPENVPN
default m
select BR2_PACKAGE_KMOD_TUN
select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_LZO
help
Open Source VPN solution using SSL
http://openvpn.net/
+
+config BR2_PACKAGE_OPENVPN_SERVER
+ bool "Enable server support"
+ default y
+ depends BR2_PACKAGE_OPENVPN
+
+config BR2_PACKAGE_OPENVPN_LZO
+ bool "Enable transparent compression (lzo)"
+ default y
+ depends BR2_PACKAGE_OPENVPN
+ select BR2_PACKAGE_LZO
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index bab2528906..991e52f9e1 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -14,6 +14,14 @@ PKG_CAT:=zcat
PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg
+ifneq ($(BR2_PACKAGE_OPENVPN_LZO),y)
+DISABLE_LZO:=--disable-lzo
+endif
+
+ifneq ($(BR2_PACKAGE_OPENVPN_SERVER),y)
+DISABLE_SERVER:=--disable-server
+endif
+
$(DL_DIR)/$(PKG_SOURCE):
$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL)
@@ -46,6 +54,8 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
--disable-management \
--disable-socks \
--disable-http \
+ $(DISABLE_LZO) \
+ $(DISABLE_SERVER) \
);
touch $(PKG_BUILD_DIR)/.configured