diff --git a/Makefile.in b/Makefile.in
index a850070e..c04592df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,10 +86,10 @@ checkinstall:
 
 # May cause circular include->include,lib
 $(SUBDIRS2): $(SUBDIRS1) # Cannot build app before lib (for parallel make -j)
-	(cd $@ && $(MAKE) $(MFLAGS) all)
+	(cd $@ && $(MAKE) $(MFLAGS) all || exit 1)
 
 $(SUBDIRS1): 
-	(cd $@ && $(MAKE) $(MFLAGS) all)
+	(cd $@ && $(MAKE) $(MFLAGS) all || exit 1)
 
 depend:
 	for i in $(SUBDIRS) doc example docker; \
diff --git a/configure b/configure
index 7b134cf0..7451516b 100755
--- a/configure
+++ b/configure
@@ -777,6 +777,7 @@ with_yang_standard_dir
 with_clicon_user
 with_clicon_group
 enable_nls
+enable_event_poll
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1423,6 +1424,7 @@ Optional Features:
                           http/1 only
   --enable-netsnmp        Enable net-snmp Clixon YANG mapping
 
+  --enable-event-poll     Enable event polling feature
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -2838,10 +2840,10 @@ fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: debug is $ac_enable_debug" >&5
 printf "%s\n" "debug is $ac_enable_debug" >&6; }
 if test "$ac_enable_debug" = "yes"; then
-   : ${CFLAGS="-g -Wall"}
+   : ${CFLAGS="-g -Wall -Werror"}
    INSTALLFLAGS=""
 else
-   : ${CFLAGS="-O2 -Wall"}
+   : ${CFLAGS="-O2 -Wall -Werror"}
 fi
 
 ac_config_headers="$ac_config_headers include/clixon_config.h lib/clixon/clixon.h"
@@ -7019,6 +7021,18 @@ fi
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 
+# Check whether --enable-event-poll was given.
+if test ${enable_event_poll+y}
+then :
+  enableval=$enable_event_poll; if test "$enable_event_poll" = "yes"; then
+
+printf "%s\n" "#define CLIXON_EVENT_POLL 1" >>confdefs.h
+
+     fi
+
+fi
+
+
 ac_config_files="$ac_config_files Makefile lib/Makefile lib/src/Makefile lib/clixon/Makefile apps/Makefile apps/cli/Makefile apps/backend/Makefile apps/netconf/Makefile apps/restconf/Makefile apps/snmp/Makefile include/Makefile etc/Makefile etc/clixonrc example/Makefile example/main/Makefile example/main/example.xml docker/Makefile docker/clixon-dev/Makefile docker/example/Makefile docker/test/Makefile yang/Makefile yang/clixon/Makefile yang/mandatory/Makefile doc/Makefile test/Makefile test/config.sh test/cicd/Makefile test/vagrant/Makefile"
 
 cat >confcache <<\_ACEOF
diff --git a/configure.ac b/configure.ac
index 6202520d..34785fd5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,10 +67,10 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[Build with debug symbols,
 
 AC_MSG_RESULT(debug is $ac_enable_debug)
 if test "$ac_enable_debug" = "yes"; then
-   : ${CFLAGS="-g -Wall"}
+   : ${CFLAGS="-g -Wall -Werror"}
    INSTALLFLAGS=""
 else
-   : ${CFLAGS="-O2 -Wall"}
+   : ${CFLAGS="-O2 -Wall -Werror"}
 fi
 
 AC_CONFIG_HEADERS([include/clixon_config.h lib/clixon/clixon.h])
diff --git a/lib/Makefile.in b/lib/Makefile.in
index f012de86..1169c2d2 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -54,7 +54,7 @@ depend:
 		do (cd $$i; $(MAKE) $(MFLAGS) depend); done
 
 $(SUBDIRS):
-		(cd $@; $(MAKE) $(MFLAGS) all)
+		(cd $@; $(MAKE) $(MFLAGS) all || exit 1)
 
 install:
 	for i in $(SUBDIRS); \