Build fixes for *NIX.

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

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;

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

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);
 

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