From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 10 Feb 2006 21:32:10 +0000 (+0000)
Subject: openvpn without ssl closes #277/#278
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b23523695d5f8dc1b25e1f315b18a2491908512;p=openwrt%2Fstaging%2Fneocturne.git

openvpn without ssl closes #277/#278

SVN-Revision: 3217
---

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 0a2731b726..927ad57bb9 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/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/openwrt/package/openvpn/Config.in b/openwrt/package/openvpn/Config.in
index 6117a8e99c..860a39f034 100644
--- a/openwrt/package/openvpn/Config.in
+++ b/openwrt/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/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile
index a34bf4436c..e5e1275841 100644
--- a/openwrt/package/openvpn/Makefile
+++ b/openwrt/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) \
 	);