nginx: Add missing zlib dependency

[openwrt/svn-archive/archive.git] / net / nginx / Makefile

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 6f01f76a09a5f592770e0878da350d05aef2a8fe..2c4a552f77f05d8d8864e19781ec9b688ee01e9c 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -9,12 +9,21 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=0.7.67
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://sysoev.ru/nginx/
 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
@@ -22,7 +31,7 @@ define Package/nginx
   CATEGORY:=Network
   TITLE:=Nginx web server
   URL:=http://nginx.net/
-  DEPENDS:=+libpcre
+  DEPENDS:=+libpcre +NGINX_SSL:libopenssl +zlib
   MENU:=1
 endef
 
@@ -60,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
@@ -86,9 +97,7 @@ define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR=$(PKG_INSTALL_DIR) \
-               build install
+       $(call Build/Compile/Default,build)
 endef
 
 define Package/nginx/install