[PATCH] module/helloworld.c vs. "--disable-event-broker"

[Holger Weiss]

"./configure --disable-event-broker; make all" currently fails due to
the neb_set_module_info() calls added to module/helloworld.c (r1.6).  I
guess "make all" should simply omit building module/helloworld.o if
"--disable-event-broker" was specified, as e.g. with the attached patch?

Holger
-------------- next part --------------
Index: Makefile.in
===================================================================
RCS file: /cvsroot/nagios/nagios/Makefile.in,v
retrieving revision 1.32
diff -u -r1.32 Makefile.in
--- Makefile.in	10 Nov 2007 22:54:35 -0000	1.32
+++ Makefile.in	27 Dec 2007 20:25:25 -0000
@@ -37,6 +37,8 @@
 CGICFGDIR=$(CGIDIR)
 PERLDIR=@PERLDIR@
 
+USE_EVENTBROKER=@USE_EVENTBROKER@
+
 INSTALLPERLSTUFF=@INSTALLPERLSTUFF@
 
 CGIEXTRAS=@CGIEXTRAS@
@@ -60,7 +62,9 @@
 	cd $(SRC_BASE) && $(MAKE)
 	cd $(SRC_CGI) && $(MAKE)
 	cd $(SRC_HTM) && $(MAKE)
-	cd $(SRC_MODULE) && $(MAKE)
+	if [ x$(USE_EVENTBROKER) = xyes ]; then \
+		cd $(SRC_MODULE) && $(MAKE); \
+	fi
 
 	@echo ""
 	@echo "*** Compile finished ***"
Index: configure.in
===================================================================
RCS file: /cvsroot/nagios/nagios/configure.in,v
retrieving revision 1.121
diff -u -r1.121 configure.in
--- configure.in	17 Dec 2007 17:51:51 -0000	1.121
+++ configure.in	27 Dec 2007 20:25:25 -0000
@@ -756,6 +756,7 @@
 AC_SUBST(BASEEXTRALIBS)
 AC_SUBST(INITDIR)
 AC_SUBST(INSTALLPERLSTUFF)
+AC_SUBST(USE_EVENTBROKER)
 
 AC_PATH_PROG(PERL,perl)
 AC_OUTPUT(Makefile subst pkginfo base/Makefile common/Makefile contrib/Makefile cgi/Makefile html/Makefile module/Makefile xdata/Makefile daemon-init html/index.html html/side.html)
-------------- next part --------------
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
-------------- next part --------------
_______________________________________________
Nagios-devel mailing list
Nagios-devel at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nagios-devel