Build fixes for *NIX.

diff --git a/base/Makefile.am b/base/Makefile.am
index 2e0a786b550ffe29037085a2714babf7d82e2de2..8aa1c823020e1d27e67e2bde7cd8838eac8e5676 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -24,6 +24,8 @@ libbase_la_SOURCES =  \
        ioqueue.h \
        logger.cpp \
        logger.h \
+       netstring.cpp \
+       netstring.h \
        object.cpp \
        object.h \
        objectset.cpp \
@@ -71,6 +73,7 @@ libbase_la_CPPFLAGS = \
        $(BOOST_CPPFLAGS) \
        $(OPENSSL_INCLUDES) \
        -I${top_srcdir}/third-party/mmatch \
+       -I${top_srcdir}/third-party/cJSON \
        -I${top_srcdir}/third-party/popen-noshell
 
 libbase_la_LDFLAGS = \
@@ -86,4 +89,5 @@ libbase_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
        ${top_builddir}/third-party/mmatch/libmmatch.la \
+       ${top_builddir}/third-party/cJSON/libcJSON.la \
        ${top_builddir}/third-party/popen-noshell/libpopen_noshell.la

diff --git a/base/application.cpp b/base/application.cpp
index 7cc670cc72aa460e97295ab330a7ec411b6cbd0e..6e8f1542e1f4c7279a34fee235a791fc4f52c61f 100644 (file)
--- a/base/application.cpp
+++ b/base/application.cpp
@@ -19,10 +19,6 @@
 
 #include "i2-base.h"
 
-#ifndef _WIN32
-#      include <ltdl.h>
-#endif
-
 using namespace icinga;
 
 Application::Ptr Application::m_Instance;

diff --git a/base/configobject.cpp b/base/configobject.cpp
index 6cc07e1d425b41f630e1ac548bdf13a255fcdb45..f876f293b7c8dc1c214d9802446d23d2d7783290 100644 (file)
--- a/base/configobject.cpp
+++ b/base/configobject.cpp
@@ -305,10 +305,10 @@ void ConfigObject::RestoreObjects(const string& filename)
                        continue;
 
                ConfigObject::Ptr object = boost::make_shared<ConfigObject>(properties);
+               object->SetTags(tags);
 
                if (!object->GetSource().empty()) {
                        /* restore replicated objects right away */
-                       object->SetTags(tags);
                        object->Commit();
                } else {
                        /* keep non-replicated objects until another config object with

diff --git a/base/unix.h b/base/unix.h
index 0e790f2b2b6060228dff5ba122dfb61f9120f2bc..e463afe153ce7482f57865472ca0680d155e03d6 100644 (file)
--- a/base/unix.h
+++ b/base/unix.h
@@ -35,6 +35,7 @@
 #include <libgen.h>
 #include <syslog.h>
 #include <sys/file.h>
+#include <ltdl.h>
 
 void Sleep(unsigned long milliseconds);
 

diff --git a/jsonrpc/Makefile.am b/jsonrpc/Makefile.am
index 3d03875b239dff03131f170d69606ca22af3ed9f..85fcccc4ff188cb6b8c90f905452f5e9e91d387f 100644 (file)
--- a/jsonrpc/Makefile.am
+++ b/jsonrpc/Makefile.am
@@ -12,8 +12,6 @@ libjsonrpc_la_SOURCES = \
        jsonrpcserver.h \
        messagepart.cpp \
        messagepart.h \
-       netstring.cpp \
-       netstring.h \
        requestmessage.cpp \
        requestmessage.h \
        responsemessage.cpp \
@@ -22,8 +20,7 @@ libjsonrpc_la_SOURCES = \
 libjsonrpc_la_CPPFLAGS = \
        -DI2_JSONRPC_BUILD \
        $(BOOST_CPPFLAGS) \
-       -I${top_srcdir}/base \
-       -I${top_srcdir}/third-party/cJSON
+       -I${top_srcdir}/base
 
 libjsonrpc_la_LDFLAGS = \
        $(BOOST_LDFLAGS) \
@@ -32,5 +29,4 @@ libjsonrpc_la_LDFLAGS = \
        @VERSION_INFO@
 
 libjsonrpc_la_LIBADD = \
-       ${top_builddir}/base/libbase.la \
-       ${top_builddir}/third-party/cJSON/libcJSON.la
+       ${top_builddir}/base/libbase.la