summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-10 21:32:10 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-02-10 21:32:10 +0000
commit70441823af82cfa209507561f48d811c792d9289 (patch)
tree3d36fcc6d9158594aac56403c2ff0e0c3f5657dc
parentc2a8a1896632d0c661918e0bedd71db9bcd1578f (diff)
openvpn without ssl closes #277/#278
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3217 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/Makefile2
-rw-r--r--package/openvpn/Config.in10
-rw-r--r--package/openvpn/Makefile10
3 files changed, 19 insertions, 3 deletions
diff --git a/package/Makefile b/package/Makefile
index 0a2731b726..927ad57bb9 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -411,7 +411,9 @@ ifneq ($(BR2_PACKAGE_MPD_FLAC),)
mpd-compile: flac-compile
endif
+ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
openvpn-compile: openssl-compile
+endif
ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y)
openvpn-compile: liblzo-compile
endif
diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 6117a8e99c..860a39f034 100644
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -5,13 +5,12 @@ config BR2_PACKAGE_OPENVPN
tristate
default m if CONFIG_DEVEL
select BR2_PACKAGE_KMOD_TUN
- select BR2_PACKAGE_LIBOPENSSL
help
Open Source VPN solution using SSL
http://openvpn.net/
- Depends: kmod-tun, libpthread, openssl
+ Depends: kmod-tun, libpthread
config BR2_COMPILE_OPENVPN_WITH_SERVER
prompt "Enable server support"
@@ -25,6 +24,13 @@ config BR2_COMPILE_OPENVPN_WITH_HTTP
default y
depends BR2_PACKAGE_OPENVPN
+config BR2_COMPILE_OPENVPN_WITH_OPENSSL
+ prompt "Enable openssl support"
+ bool
+ default y
+ depends BR2_PACKAGE_OPENVPN
+ select BR2_PACKAGE_LIBOPENSSL
+
config BR2_COMPILE_OPENVPN_WITH_LZO
prompt "Enable transparent compression (lzo)"
bool
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index a34bf4436c..e5e1275841 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -18,7 +18,14 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-PKG_DEPEND:="libopenssl, kmod-tun"
+PKG_DEPEND:="kmod-tun"
+
+ifneq ($(BR2_COMPILE_OPENVPN_WITH_OPENSSL),y)
+DISABLE_OPENSSL:=--disable-ssl --disable-crypto
+else
+PKG_DEPEND+=", libopenssl"
+endif
+
ifneq ($(BR2_COMPILE_OPENVPN_WITH_LZO),y)
DISABLE_LZO:=--disable-lzo
else
@@ -66,6 +73,7 @@ $(PKG_BUILD_DIR)/.configured:
--disable-management \
--disable-socks \
$(DISABLE_LZO) \
+ $(DISABLE_OPENSSL) \
$(DISABLE_SERVER) \
$(DISABLE_HTTP) \
);