From b43c5a6b1e527cb296d7dac6394f4c50ef3a4a1e Mon Sep 17 00:00:00 2001
From: "Anton D. Kachalov" <mouse@yandex-team.ru>
Date: Mon, 10 Aug 2015 14:44:11 -0600
Subject: [PATCH] THTTPD: Depends on !DISABLE_POLL webserver:  Allow to build
 webserver as an application

Signed-off-by: Anton D. Kachalov mouse@yandex-team.ru
---
 examples/webserver/Makefile | 13 +++++++++++++
 netutils/thttpd/Kconfig     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/examples/webserver/Makefile b/examples/webserver/Makefile
index 384bf0910..3f4b1c1bb 100644
--- a/examples/webserver/Makefile
+++ b/examples/webserver/Makefile
@@ -75,6 +75,12 @@ PROGNAME = $(CONFIG_XYZ_PROGNAME)
 
 ROOTDEPPATH = --dep-path .
 
+# Webserver built-in application info
+
+APPNAME = webserver
+PRIORITY = SCHED_PRIORITY_DEFAULT
+STACKSIZE = 2048
+
 # Common build
 
 VPATH =
@@ -108,7 +114,14 @@ install:
 
 endif
 
+ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
+$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
+	$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
+
+context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
+else
 context:
+endif
 
 .depend: Makefile $(SRCS)
 	@$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep
diff --git a/netutils/thttpd/Kconfig b/netutils/thttpd/Kconfig
index d08f76054..68d6d79b7 100644
--- a/netutils/thttpd/Kconfig
+++ b/netutils/thttpd/Kconfig
@@ -6,7 +6,7 @@
 config NETUTILS_THTTPD
 	bool "THTTPD webserver"
 	default n
-	depends on NXFLAT || FS_BINFS
+	depends on (NXFLAT || FS_BINFS) && !DISABLE_POLL
 	---help---
 		Enable support for the THTTPD webservert.