Fixed *NIX build

diff --git a/base/Makefile.am b/base/Makefile.am
index 1be3ec21ec93db70640735cfd265ab68326abe6b..34afd6292f6c01e4b91e33ceeed4748397c851c2 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -50,5 +50,5 @@ libbase_la_SOURCES =  \
 
 libbase_la_LIBADD=$(LIBLTDL)
 
-AM_CFLAGS=$(LTDLINCL)
-AM_CXXFLAGS=$(LTDLINCL)
+libbase_la_CFLAGS=$(LTDLINCL) -DI2_BASE_BUILD
+libbase_la_CXXFLAGS=$(LTDLINCL) -DI2_BASE_BUILD

diff --git a/base/application.cpp b/base/application.cpp
index 1f50c454f26e4994e9b0460138a757bb960595fa..c829a3c27d88c7290dc60ab413f2d3b1c47c77b7 100644 (file)
--- a/base/application.cpp
+++ b/base/application.cpp
@@ -386,7 +386,7 @@ int application_main(int argc, char **argv, Application::Ptr instance)
 #ifndef _WIN32
        struct sigaction sa;
        memset(&sa, 0, sizeof(sa));
-       sa.sa_handler = sigint_handler;
+       sa.sa_handler = application_sigint_handler;
        sigaction(SIGINT, &sa, NULL);
 #endif /* _WIN32 */
 

diff --git a/configfilecomponent/Makefile.am b/configfilecomponent/Makefile.am
index f148af252ccb030a0bcd98bd598e9745b38f0303..6f3ac1e8e0bdc2102d584bc5abfffa132fa64e35 100644 (file)
--- a/configfilecomponent/Makefile.am
+++ b/configfilecomponent/Makefile.am
@@ -8,7 +8,10 @@ libconfigfilecomponent_la_SOURCES =  \
        configfilecomponent.h \
        i2-configfilecomponent.h
 
-libconfigfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base -I${top_srcdir}/jsonrpc
+libconfigfilecomponent_la_CXXFLAGS = -I${top_srcdir}/base \
+       -I${top_srcdir}/jsonrpc \
+       -I${top_srcdir}/cJSON
 
 libconfigfilecomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined
-libconfigfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la ${top_builddir}/cJSON/libcJSON.la
\ No newline at end of file
+libconfigfilecomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
+       ${top_builddir}/cJSON/libcJSON.la
\ No newline at end of file

diff --git a/configrpccomponent/Makefile.am b/configrpccomponent/Makefile.am
index 8a57eb2cb1f3e42b097ba60b6fb9c29505bb0aa5..001e14624028bf5ccb5a4d05f284ee94c1ab5f82 100644 (file)
--- a/configrpccomponent/Makefile.am
+++ b/configrpccomponent/Makefile.am
@@ -8,7 +8,10 @@ libconfigrpccomponent_la_SOURCES =  \
        configrpccomponent.h \
        i2-configrpccomponent.h
 
-libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base -I${top_srcdir}/jsonrpc -I${top_srcdir}/icinga
+libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
+       -I${top_srcdir}/jsonrpc \
+       -I${top_srcdir}/cJSON \
+       -I${top_srcdir}/icinga
 
 libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
 libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \

diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index 17173c70cc62de8aac2465c3d8d3dce249c70480..a6856e7dabaa7ca2110827599a535f059f11b757 100644 (file)
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -18,7 +18,9 @@ icinga_SOURCES =  \
        virtualendpoint.h
 
 icinga_CXXFLAGS = -I${top_srcdir}/base \
-       -I${top_srcdir}/jsonrpc  -I${top_srcdir}
+       -I${top_srcdir}/jsonrpc \
+       -I${top_srcdir}/cJSON \
+       -I${top_srcdir}
 
 icinga_LDFLAGS = $(top_builddir)/jsonrpc/libjsonrpc.la \
        $(top_builddir)/base/libbase.la \

diff --git a/icinga/endpointmanager.cpp b/icinga/endpointmanager.cpp
index a4875a9d6be75cd838a51328a5fd1021c08a721d..3eb1c072fe431efed3164a961616ad101b353e7a 100644 (file)
--- a/icinga/endpointmanager.cpp
+++ b/icinga/endpointmanager.cpp
@@ -124,7 +124,7 @@ void EndpointManager::UnregisterEndpoint(Endpoint::Ptr endpoint)
 void EndpointManager::SendMessage(Endpoint::Ptr source, Endpoint::Ptr destination, JsonRpcMessage::Ptr message)
 {
        if (destination) {
-               destination->SendMessageA(source, message);
+               destination->SendMessage(source, message);
        } else {
                for (list<Endpoint::Ptr>::iterator i = m_Endpoints.begin(); i != m_Endpoints.end(); i++)
                {

diff --git a/jsonrpc/Makefile.am b/jsonrpc/Makefile.am
index bef23d8ddbeae0c5162f8de6797a2f32d4846712..85cedf4059feca3b4e2b8bfeee2b3d6c243c7a34 100644 (file)
--- a/jsonrpc/Makefile.am
+++ b/jsonrpc/Makefile.am
@@ -15,4 +15,6 @@ libjsonrpc_la_SOURCES =  \
        netstring.cpp \
        netstring.h
 
-libjsonrpc_la_CXXFLAGS = -I${top_srcdir}/base 
+libjsonrpc_la_CFLAGS = -DI2_JSONRPC_BUILD
+libjsonrpc_la_CXXFLAGS = -DI2_JSONRPC_BUILD -I${top_srcdir}/base \
+       -I${top_srcdir}/cJSON