tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-20 20:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Build fixes for *NIX.

Browse Source
This commit is contained in:
Gunnar Beutner 2012-07-24 13:45:21 +02:00
parent bd8e0a9001
commit 5a80d47ca0
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/Makefile.am
View File

@ -24,6 +24,8 @@ libbase_la_SOURCES = \
ioqueue.h \ ioqueue.h \
logger.cpp \ logger.cpp \
logger.h \ logger.h \
netstring.cpp \
netstring.h \
object.cpp \ object.cpp \
object.h \ object.h \
objectset.cpp \ objectset.cpp \
@ -71,6 +73,7 @@ libbase_la_CPPFLAGS = \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
$(OPENSSL_INCLUDES) \ $(OPENSSL_INCLUDES) \
-I${top_srcdir}/third-party/mmatch \ -I${top_srcdir}/third-party/mmatch \
-I${top_srcdir}/third-party/cJSON \
-I${top_srcdir}/third-party/popen-noshell -I${top_srcdir}/third-party/popen-noshell
libbase_la_LDFLAGS = \ libbase_la_LDFLAGS = \
@ -86,4 +89,5 @@ libbase_la_LIBADD = \
$(BOOST_SIGNALS_LIB) \ $(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \ $(BOOST_THREAD_LIB) \
${top_builddir}/third-party/mmatch/libmmatch.la \ ${top_builddir}/third-party/mmatch/libmmatch.la \
${top_builddir}/third-party/cJSON/libcJSON.la \
${top_builddir}/third-party/popen-noshell/libpopen_noshell.la ${top_builddir}/third-party/popen-noshell/libpopen_noshell.la

4
base/application.cpp
View File

@ -19,10 +19,6 @@
#include "i2-base.h" #include "i2-base.h"
#ifndef _WIN32
# include <ltdl.h>
#endif
using namespace icinga; using namespace icinga;
Application::Ptr Application::m_Instance; Application::Ptr Application::m_Instance;

2
base/configobject.cpp
View File

@ -305,10 +305,10 @@ void ConfigObject::RestoreObjects(const string& filename)
continue; continue;
ConfigObject::Ptr object = boost::make_shared<ConfigObject>(properties); ConfigObject::Ptr object = boost::make_shared<ConfigObject>(properties);
object->SetTags(tags);
if (!object->GetSource().empty()) { if (!object->GetSource().empty()) {
/* restore replicated objects right away */ /* restore replicated objects right away */
object->SetTags(tags);
object->Commit(); object->Commit();
} else { } else {
/* keep non-replicated objects until another config object with /* keep non-replicated objects until another config object with

1
base/unix.h
View File

@ -35,6 +35,7 @@
#include <libgen.h> #include <libgen.h>
#include <syslog.h> #include <syslog.h>
#include <sys/file.h> #include <sys/file.h>
#include <ltdl.h>
void Sleep(unsigned long milliseconds); void Sleep(unsigned long milliseconds);

8
jsonrpc/Makefile.am
View File

@ -12,8 +12,6 @@ libjsonrpc_la_SOURCES = \
jsonrpcserver.h \ jsonrpcserver.h \
messagepart.cpp \ messagepart.cpp \
messagepart.h \ messagepart.h \
netstring.cpp \
netstring.h \
requestmessage.cpp \ requestmessage.cpp \
requestmessage.h \ requestmessage.h \
responsemessage.cpp \ responsemessage.cpp \
@ -22,8 +20,7 @@ libjsonrpc_la_SOURCES = \
libjsonrpc_la_CPPFLAGS = \ libjsonrpc_la_CPPFLAGS = \
-DI2_JSONRPC_BUILD \ -DI2_JSONRPC_BUILD \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
-I${top_srcdir}/base \ -I${top_srcdir}/base
-I${top_srcdir}/third-party/cJSON
libjsonrpc_la_LDFLAGS = \ libjsonrpc_la_LDFLAGS = \
$(BOOST_LDFLAGS) \ $(BOOST_LDFLAGS) \
@ -32,5 +29,4 @@ libjsonrpc_la_LDFLAGS = \
@VERSION_INFO@ @VERSION_INFO@
libjsonrpc_la_LIBADD = \ libjsonrpc_la_LIBADD = \
${top_builddir}/base/libbase.la \ ${top_builddir}/base/libbase.la
${top_builddir}/third-party/cJSON/libcJSON.la