Build fixes.

diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am
index dc864d7c2ffe44fa224d3a7571c05ca8181c7bcf..2987de93d0783e49ce896b0d6eb25649e404492a 100644 (file)
--- a/icinga-app/Makefile.am
+++ b/icinga-app/Makefile.am
@@ -21,6 +21,7 @@ icinga_LDFLAGS = \
 icinga_LDADD = \
        ${top_builddir}/base/libbase.la \
        ${top_builddir}/icinga/libicinga.la \
+       -dlopen ${top_builddir}/components/checker/checker.la \
        -dlopen ${top_builddir}/components/configfile/configfile.la \
        -dlopen ${top_builddir}/components/configrpc/configrpc.la \
        -dlopen ${top_builddir}/components/demo/demo.la \

diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index 318853ab492063d807832e1ecc82506a19a983a9..319b218ff4c56beba25218faa8b7a18dfc80ddad 100644 (file)
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -5,6 +5,10 @@ pkglib_LTLIBRARIES =  \
        libicinga.la
 
 libicinga_la_SOURCES =  \
+       checktask.cpp \
+       checktask.h \
+       configobjectadapter.cpp \
+       configobjectadapter.h \
        endpoint.cpp \
        endpoint.h \
        endpointmanager.cpp \
@@ -13,9 +17,17 @@ libicinga_la_SOURCES =  \
        icingaapplication.h \
        icingacomponent.cpp \
        icingacomponent.h \
+       host.cpp \
+       host.h \
        i2-icinga.h \
        jsonrpcendpoint.cpp \
        jsonrpcendpoint.h \
+       macroprocessor.cpp \
+       macroprocessor.h \
+       nagioschecktask.cpp \
+       nagioschecktask.h \
+       service.cpp \
+       service.h \
        virtualendpoint.cpp \
        virtualendpoint.h
 

diff --git a/icinga/nagioschecktask.cpp b/icinga/nagioschecktask.cpp
index 2fccdb237ced1f7930b52f2d6468bb93089c37e3..dc2f3a08aac1357850278049a115bb4bc43b0d16 100644 (file)
--- a/icinga/nagioschecktask.cpp
+++ b/icinga/nagioschecktask.cpp
@@ -37,7 +37,7 @@ CheckResult NagiosCheckTask::Execute(void) const
 
        cr.Output = output.str();
 
-       int status, exitstatus;
+       int status, exitcode;
 #ifdef _MSC_VER
        status = _pclose(fp);
 #else /* _MSC_VER */
@@ -48,10 +48,10 @@ CheckResult NagiosCheckTask::Execute(void) const
        if (WIFEXITED(status)) {
                exitcode = WEXITSTATUS(status);
 #else /* _MSC_VER */
-               exitstatus = status;
+               exitcode = status;
 #endif /* _MSC_VER */
 
-               switch (exitstatus) {
+               switch (exitcode) {
                        case 0:
                                cr.State = StateOK;
                                break;
@@ -68,7 +68,7 @@ CheckResult NagiosCheckTask::Execute(void) const
 #ifndef _MSC_VER
        } else if (WIFSIGNALED(status)) {
                cr.Output = "Process was terminated by signal " + WTERMSIG(status);
-               cr.Status = StateUnknown;
+               cr.State = StateUnknown;
        }
 #endif /* _MSC_VER */