summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-03 21:36:01 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-03 21:36:01 +0000
commit68b3a26938fe4fe342bd0e7b88bb5a1f96e51480 (patch)
tree5dba2ed7ec692830aebceb8f7aa6f65cfc107067
parent5beb2acad5e2a34b5c2bbeb210af7d8426baa527 (diff)
make lzo and server support in openvpn optional
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@551 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/Makefile4
-rw-r--r--openwrt/package/openvpn/Config.in12
-rw-r--r--openwrt/package/openvpn/Makefile10
-rwxr-xr-xopenwrt/scripts/configtest.pl1
4 files changed, 26 insertions, 1 deletions
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 9804dedee4..bb378848ff 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/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/openwrt/package/openvpn/Config.in b/openwrt/package/openvpn/Config.in
index 442313fff6..873e61b9d4 100644
--- a/openwrt/package/openvpn/Config.in
+++ b/openwrt/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/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index bab2528906..991e52f9e1 100644
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/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
diff --git a/openwrt/scripts/configtest.pl b/openwrt/scripts/configtest.pl
index 05022debd3..3ca33d86c5 100755
--- a/openwrt/scripts/configtest.pl
+++ b/openwrt/scripts/configtest.pl
@@ -1,6 +1,7 @@
#!/usr/bin/perl
my %change = (
'BUSYBOX' => 'make -C package busybox-clean',
+ 'OPENVPN_' => 'make -C package openvpn-clean',
'' => 'make target_clean'
);