Build fix.

diff --git a/base/Makefile.am b/base/Makefile.am
index 34afd6292f6c01e4b91e33ceeed4748397c851c2..f73a6b8944a36cd4dc59040cd178b61f9880fdb6 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 
-noinst_LTLIBRARIES =  \
+pkglib_LTLIBRARIES =  \
        libbase.la
 
 libbase_la_SOURCES =  \
@@ -50,5 +50,4 @@ libbase_la_SOURCES =  \
 
 libbase_la_LIBADD=$(LIBLTDL)
 
-libbase_la_CFLAGS=$(LTDLINCL) -DI2_BASE_BUILD
-libbase_la_CXXFLAGS=$(LTDLINCL) -DI2_BASE_BUILD
+libbase_la_CXXFLAGS=$(LTDLINCL) -DI2_BASE_BUILD -pthread

diff --git a/base/application.cpp b/base/application.cpp
index 010b95b95b88e6d01474ec3f48e5fd530378ae6a..2e45bbaeeb44c8f74d5e072f332081bbcfbba5f4 100644 (file)
--- a/base/application.cpp
+++ b/base/application.cpp
@@ -193,7 +193,7 @@ Component::Ptr Application::LoadComponent(const string& path, const ConfigObject
        lt_dlhandle hModule = 0;
        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);
        }
 

diff --git a/icinga/Makefile.am b/icinga/Makefile.am
index a6856e7dabaa7ca2110827599a535f059f11b757..71ae3ffb1377666a037d02d039716877747ea297 100644 (file)
--- a/icinga/Makefile.am
+++ b/icinga/Makefile.am
@@ -17,7 +17,9 @@ icinga_SOURCES =  \
        virtualendpoint.cpp \
        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}/cJSON \
        -I${top_srcdir}