From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 11 Sep 2010 18:38:49 +0000 (+0000)
Subject: [package] allow openvpn to be compiled without LZO support (#7843)
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=cd1b8b24efea875a311d6b43d2478aa0f0f86c4f;p=packages.git

[package] allow openvpn to be compiled without LZO support (#7843)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@23019 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 109238a81..7f8ebf2e7 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 PKG_VERSION:=2.1.1
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
@@ -22,12 +22,19 @@ include $(INCLUDE_DIR)/package.mk
 define Package/openvpn
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+kmod-tun +libopenssl +liblzo
+  DEPENDS:=+kmod-tun +libopenssl +PACKAGE_openvpn_complzo:liblzo
   TITLE:=Open source VPN solution using SSL
   URL:=http://openvpn.net
   SUBMENU:=VPN
 endef
 
+define Package/openvpn/config
+config PACKAGE_openvpn_complzo
+	bool "Enable --comp-lzo compression option"
+	depends on PACKAGE_openvpn
+	default y
+endef
+
 define Package/openvpn/conffiles
 /etc/config/openvpn
 endef
@@ -57,6 +64,11 @@ CONFIGURE_ARGS+= \
 	--enable-password-save \
 	--enable-small
 
+ifndef CONFIG_PACKAGE_openvpn_complzo
+CONFIGURE_ARGS += \
+	--disable-lzo
+endif
+
 define Build/Configure
 	$(call Build/Configure/Default, \
 		$(CONFIGURE_ARGS) \