From fda4f1189b3a3b968193a5eb0edbf0ba8942d7e5 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Fri, 6 Apr 2012 09:18:06 +0200
Subject: [PATCH] Build fix.

---
 base/Makefile.am     | 5 ++---
 base/application.cpp | 2 +-
 icinga/Makefile.am   | 4 +++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/base/Makefile.am b/base/Makefile.am
index 34afd6292..f73a6b894 100644
--- 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 010b95b95..2e45bbaee 100644
--- 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 a6856e7da..71ae3ffb1 100644
--- 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}