aboutsummaryrefslogtreecommitdiff
path: root/net/nginx/Makefile
diff options
context:
space:
mode:
authorChristian Marangi <ansuelsmth@gmail.com>2023-04-20 07:43:53 +0200
committerChristian Marangi <ansuelsmth@gmail.com>2023-04-20 07:45:30 +0200
commit8b144f0dc3eb4f4aaccbc74193df5e6f0956ae04 (patch)
tree314591ac84c7e0094f889f2422abfc7a737715ea /net/nginx/Makefile
parente14a7073b6209701f401aab01fa1a655b76c347c (diff)
nginx: split DAV_EXT from standard nginx DAV config
Split DAV_EXT from standard nginx DAV config as additional WebDAV methods are provided by an external module. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'net/nginx/Makefile')
-rw-r--r--net/nginx/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index aa43193ca..86a7a212f 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -27,6 +27,7 @@ PKG_BUILD_FLAGS:=gc-sections
PKG_CONFIG_DEPENDS := \
CONFIG_NGINX_DAV \
+ CONFIG_NGINX_DAV_EXT \
CONFIG_NGINX_FLV \
CONFIG_NGINX_UBUS \
CONFIG_NGINX_STUB_STATUS \
@@ -248,7 +249,10 @@ ifneq ($(BUILD_VARIANT),all-module)
ADDITIONAL_MODULES += --with-http_flv_module
endif
ifeq ($(CONFIG_NGINX_DAV),y)
- ADDITIONAL_MODULES += --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
+ ADDITIONAL_MODULES += --with-http_dav_module
+ endif
+ ifeq ($(CONFIG_NGINX_DAV_EXT),y)
+ ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
endif
ifeq ($(CONFIG_NGINX_UBUS),y)
ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
@@ -297,6 +301,7 @@ else
CONFIG_NGINX_NAXSI:=y
CONFIG_NGINX_LUA:=y
CONFIG_NGINX_DAV:=y
+ CONFIG_NGINX_DAV_EXT:=y
CONFIG_NGINX_UBUS:=y
ADDITIONAL_MODULES += --with-ipv6 --with-http_stub_status_module --with-http_flv_module \
--with-http_dav_module \
@@ -508,7 +513,7 @@ endef
define Build/Patch
$(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
-ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" ""
+ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" ""
$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
endif
ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
@@ -562,7 +567,7 @@ ifeq ($(CONFIG_NGINX_TS_MODULE),y)
$(Prepare/nginx-ts)
endif
-ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" ""
+ifneq "$(or $(CONFIG_NGINX_DAV_EXT),$(QUILT))" ""
$(eval $(call Download,nginx-dav-ext-module))
$(Prepare/nginx-dav-ext-module)
endif