Build fixes.

base/application.cpp

@@ -190,14 +190,7 @@ Component::Ptr Application::LoadComponent(const string& path, const ConfigObject
 #ifdef _WIN32
 	HMODULE hModule = LoadLibrary(path.c_str());
 #else /* _WIN32 */
-	lt_dlhandle hModule = 0;
-	lt_dladvise advise;
-
-	if (!lt_dladvise_init(&advise) && !lt_dladvise_global(&advise)) {
-		hModule = lt_dlopenadvise(path.c_str(), advise);
-	}
-
-	lt_dladvise_destroy(&advise);
+	lt_dlhandle hModule = lt_dlopen(path.c_str());
 #endif /* _WIN32 */
 
 	if (hModule == NULL)

configrpccomponent/Makefile.am

@@ -16,4 +16,5 @@ libconfigrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
 libconfigrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
 libconfigrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
 	${top_builddir}/jsonrpc/libjsonrpc.la \
-	${top_builddir}/cJSON/libcJSON.la
+	${top_builddir}/cJSON/libcJSON.la \
+	${top_builddir}/icinga/icinga

icinga/icinga.vcxproj

@@ -54,7 +54,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -70,7 +70,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;I2_ICINGA_BUILD;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

jsonrpc/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 
-noinst_LTLIBRARIES =  \
+pkglib_LTLIBRARIES =  \
 	libjsonrpc.la
 
 libjsonrpc_la_SOURCES =  \
@@ -15,6 +15,5 @@ libjsonrpc_la_SOURCES =  \
 	netstring.cpp \
 	netstring.h
 
-libjsonrpc_la_CFLAGS = -DI2_JSONRPC_BUILD
 libjsonrpc_la_CXXFLAGS = -DI2_JSONRPC_BUILD -I${top_srcdir}/base \
-	-I${top_srcdir}/cJSON
+	-I${top_srcdir}/cJSON