nginx: Try to fix openssl dependencies

SVN-Revision: 23426

diff --git a/net/nginx/Config.in b/net/nginx/Config.in
index 55bc482c16ac0e90ed3ee3ddd20eca14eda5b268..b24a3f307ad4f07b8b3256af06621bd19619249c 100644 (file)
--- a/net/nginx/Config.in
+++ b/net/nginx/Config.in
@@ -26,7 +26,6 @@ config NGINX_SSL
        bool
        prompt "Enable SSL module"
        default n
        bool
        prompt "Enable SSL module"
        default n

-       select PACKAGE_libopenssl

        help
                Enable HTTPS/SSL support.
 
        help
                Enable HTTPS/SSL support.
 

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index 11245222e666d3a4ebbad05743c8ee29e7fcec0c..f6eb84680761106719a39798ecc6bbb2366ec0ad 100644 (file)
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -18,6 +18,12 @@ PKG_MD5SUM:=b6e175f969d03a4d3c5643aaabc6a5ff
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
 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
 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/
   CATEGORY:=Network
   TITLE:=Nginx web server
   URL:=http://nginx.net/

-  DEPENDS:=+libpcre +libopenssl
+  DEPENDS:=+libpcre +NGINX_SSL:libopenssl

   MENU:=1
 endef
 
   MENU:=1
 endef
 


@@ -63,6 +69,8 @@ ifeq ($(CONFIG_NGINX_FLV),y)
 endif
 ifeq ($(CONFIG_NGINX_SSL),y)
   ADDITIONAL_MODULES += --with-http_ssl_module
 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
 endif
 ifeq ($(CONFIG_NGINX_DAV),y)
   ADDITIONAL_MODULES += --with-http_dav_module