tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build fix.

This commit is contained in:
Gunnar Beutner 2012-04-06 09:18:06 +02:00
parent 399b2eca19
commit fda4f1189b
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/Makefile.am
View File

@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
noinst_LTLIBRARIES = \ pkglib_LTLIBRARIES = \
libbase.la libbase.la
libbase_la_SOURCES = \ libbase_la_SOURCES = \
@ -50,5 +50,4 @@ libbase_la_SOURCES = \
libbase_la_LIBADD=$(LIBLTDL) libbase_la_LIBADD=$(LIBLTDL)
libbase_la_CFLAGS=$(LTDLINCL) -DI2_BASE_BUILD libbase_la_CXXFLAGS=$(LTDLINCL) -DI2_BASE_BUILD -pthread
libbase_la_CXXFLAGS=$(LTDLINCL) -DI2_BASE_BUILD

2
base/application.cpp
View File

@ -193,7 +193,7 @@ Component::Ptr Application::LoadComponent(const string& path, const ConfigObject
lt_dlhandle hModule = 0; lt_dlhandle hModule = 0;
lt_dladvise advise; lt_dladvise advise;
if (!lt_dladvise_init(&advise) && !lt_dladvise_local(&advise)) { if (!lt_dladvise_init(&advise) && !lt_dladvise_global(&advise)) {
hModule = lt_dlopenadvise(path.c_str(), advise); hModule = lt_dlopenadvise(path.c_str(), advise);
} }

4
icinga/Makefile.am
View File

@ -17,7 +17,9 @@ icinga_SOURCES = \
virtualendpoint.cpp \ virtualendpoint.cpp \
virtualendpoint.h virtualendpoint.h
icinga_CXXFLAGS = -I${top_srcdir}/base \ icinga_CFLAGS = -DI2_ICINGA_BUILD
icinga_CXXFLAGS = -DI2_ICINGA_BUILD -I${top_srcdir}/base \
-I${top_srcdir}/jsonrpc \ -I${top_srcdir}/jsonrpc \
-I${top_srcdir}/cJSON \ -I${top_srcdir}/cJSON \
-I${top_srcdir} -I${top_srcdir}