From 83c7aa09f3edfb21a98ab9f7af54f69fe11211ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michael=20B=C3=BCsch?= Date: Wed, 13 Oct 2010 17:38:31 +0000 Subject: [PATCH] nginx: Try to fix openssl dependencies SVN-Revision: 23426 --- net/nginx/Config.in | 1 - net/nginx/Makefile | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/net/nginx/Config.in b/net/nginx/Config.in index 55bc482c16..b24a3f307a 100644 --- a/net/nginx/Config.in +++ b/net/nginx/Config.in @@ -26,7 +26,6 @@ config NGINX_SSL bool prompt "Enable SSL module" default n - select PACKAGE_libopenssl help Enable HTTPS/SSL support. diff --git a/net/nginx/Makefile b/net/nginx/Makefile index 11245222e6..f6eb846807 100644 --- a/net/nginx/Makefile +++ b/net/nginx/Makefile @@ -18,6 +18,12 @@ PKG_MD5SUM:=b6e175f969d03a4d3c5643aaabc6a5ff PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_CONFIG_DEPENDS:=\ + CONFIG_NGINX_STUB_STATUS \ + CONFIG_NGINX_FLV \ + CONFIG_NGINX_SSL \ + CONFIG_NGINX_DAV + include $(INCLUDE_DIR)/package.mk define Package/nginx @@ -25,7 +31,7 @@ define Package/nginx CATEGORY:=Network TITLE:=Nginx web server URL:=http://nginx.net/ - DEPENDS:=+libpcre +libopenssl + DEPENDS:=+libpcre +NGINX_SSL:libopenssl MENU:=1 endef @@ -63,6 +69,8 @@ ifeq ($(CONFIG_NGINX_FLV),y) endif ifeq ($(CONFIG_NGINX_SSL),y) ADDITIONAL_MODULES += --with-http_ssl_module +else + ADDITIONAL_MODULES += --without-http-cache endif ifeq ($(CONFIG_NGINX_DAV),y) ADDITIONAL_MODULES += --with-http_dav_module -- 2.30.2