bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nginx: Try to fix openssl dependencies

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@23426 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb
2010-10-13 17:38:31 +00:00
parent 04de4f9079
commit c921d62239
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/nginx/Config.in
View File

@ -26,7 +26,6 @@ config NGINX_SSL
bool bool
prompt "Enable SSL module" prompt "Enable SSL module"
default n default n
select PACKAGE_libopenssl
help help
Enable HTTPS/SSL support. Enable HTTPS/SSL support.

10
net/nginx/Makefile
View File

@ -18,6 +18,12 @@ PKG_MD5SUM:=b6e175f969d03a4d3c5643aaabc6a5ff
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=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 include $(INCLUDE_DIR)/package.mk
define Package/nginx define Package/nginx
@ -25,7 +31,7 @@ define Package/nginx
CATEGORY:=Network CATEGORY:=Network
TITLE:=Nginx web server TITLE:=Nginx web server
URL:=http://nginx.net/ URL:=http://nginx.net/
DEPENDS:=+libpcre +libopenssl DEPENDS:=+libpcre +NGINX_SSL:libopenssl
MENU:=1 MENU:=1
endef endef
@ -63,6 +69,8 @@ ifeq ($(CONFIG_NGINX_FLV),y)
endif endif
ifeq ($(CONFIG_NGINX_SSL),y) ifeq ($(CONFIG_NGINX_SSL),y)
ADDITIONAL_MODULES += --with-http_ssl_module ADDITIONAL_MODULES += --with-http_ssl_module
else
ADDITIONAL_MODULES += --without-http-cache
endif endif
ifeq ($(CONFIG_NGINX_DAV),y) ifeq ($(CONFIG_NGINX_DAV),y)
ADDITIONAL_MODULES += --with-http_dav_module ADDITIONAL_MODULES += --with-http_dav_module