[Buildroot] [git commit] nginx: group the external modules enabling logic

Thomas Petazzoni thomas.petazzoni at free-electrons.com
Sun Dec 4 22:34:17 UTC 2016


commit: https://git.buildroot.net/buildroot/commit/?id=47bf7119d566ececc97cc74bdaa45596f965b7f6
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

This commit moves the logic that allows to enable the naxsi external
module below the "external modules" comment, which was already used for
the upload and dav-ext modules.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
 package/nginx/nginx.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 79cc4ed..b7384a2 100644
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -156,11 +156,6 @@ else
 NGINX_CONF_OPTS += --without-http_gzip_module
 endif
 
-ifeq ($(BR2_PACKAGE_NGINX_NAXSI),y)
-NGINX_DEPENDENCIES += nginx-naxsi
-NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src
-endif
-
 ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y)
 NGINX_DEPENDENCIES += pcre
 else
@@ -250,6 +245,11 @@ NGINX_CONF_OPTS += --add-module=$(NGINX_DAV_EXT_DIR)
 NGINX_DEPENDENCIES += nginx-dav-ext
 endif
 
+ifeq ($(BR2_PACKAGE_NGINX_NAXSI),y)
+NGINX_DEPENDENCIES += nginx-naxsi
+NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src
+endif
+
 # Debug logging
 NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug)
 


More information about the buildroot mailing list