summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-12-04 23:34:17 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-12-04 23:34:17 +0100
commit47bf7119d566ececc97cc74bdaa45596f965b7f6 (patch)
tree3e8f5ffcbef5ce92bad03e43097f6ecda162be20
parente58ae36520f0109bbc171e0cc3872d2b0d1be610 (diff)
downloadbuildroot-47bf7119d566ececc97cc74bdaa45596f965b7f6.tar.gz
buildroot-47bf7119d566ececc97cc74bdaa45596f965b7f6.zip
nginx: group the external modules enabling logic
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@free-electrons.com>
-rw-r--r--package/nginx/nginx.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index 79cc4ed3e3..b7384a26e8 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)
OpenPOWER on IntegriCloud