XNU build fixes.

diff --git a/components/checker/Makefile.am b/components/checker/Makefile.am
index e4e00dc278561017ab63b16398440eed5d2169be..6329c33a794723d54572db43045b95f5a6c75225 100644 (file)
--- a/components/checker/Makefile.am
+++ b/components/checker/Makefile.am
@@ -32,6 +32,7 @@ libchecker_la_LDFLAGS = \
 libchecker_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/components/compat/Makefile.am b/components/compat/Makefile.am
index 8896fde1bc3090ba9ce2e4a0a25533499d94cb5b..f79b52ba55586089a4885f6744b9f9e25cd3a1e9 100644 (file)
--- a/components/compat/Makefile.am
+++ b/components/compat/Makefile.am
@@ -32,6 +32,7 @@ libcompat_la_LDFLAGS = \
 libcompat_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/components/delegation/Makefile.am b/components/delegation/Makefile.am
index c51c691905a4bfb2bde3f0fd46abf4cec82d17a6..1dabc8611acf8be950298ebeb516fe610f83f2d1 100644 (file)
--- a/components/delegation/Makefile.am
+++ b/components/delegation/Makefile.am
@@ -32,6 +32,7 @@ libdelegation_la_LDFLAGS = \
 libdelegation_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/components/demo/Makefile.am b/components/demo/Makefile.am
index 3b5d6593f0d00a92f62138b0903a170f09f5f066..a4230cf28f356ef37b4cf67e06000f5b3ac9ffb4 100644 (file)
--- a/components/demo/Makefile.am
+++ b/components/demo/Makefile.am
@@ -32,6 +32,7 @@ libdemo_la_LDFLAGS = \
 libdemo_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/components/livestatus/Makefile.am b/components/livestatus/Makefile.am
index a94b098ee80d0922be80746f1e8c358e8785fea5..4de52ed6a467acdd7f9c7b452bede5231537fcd8 100644 (file)
--- a/components/livestatus/Makefile.am
+++ b/components/livestatus/Makefile.am
@@ -66,6 +66,7 @@ liblivestatus_la_LDFLAGS = \
 liblivestatus_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/components/notification/Makefile.am b/components/notification/Makefile.am
index 1e10da562ecee27e419b8f68a9bb268c42377d76..c86ba30109f4498666590e93884e582b8c6d3806 100644 (file)
--- a/components/notification/Makefile.am
+++ b/components/notification/Makefile.am
@@ -32,6 +32,7 @@ libnotification_la_LDFLAGS = \
 libnotification_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/components/replication/Makefile.am b/components/replication/Makefile.am
index b1eab152d76eeb9056188c695c6a21e424644201..d47d6baf32127a1afb39fd84eb8212c4eebf6a06 100644 (file)
--- a/components/replication/Makefile.am
+++ b/components/replication/Makefile.am
@@ -32,6 +32,7 @@ libreplication_la_LDFLAGS = \
 libreplication_la_LIBADD = \
        $(BOOST_SIGNALS_LIB) \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la \

diff --git a/itl/Makefile.am b/itl/Makefile.am
index b2eb46736d1e06ef017ae51d19a2fe4cbc7d8847..1dc4d4d25ec3a502d2bb44f6feea1d84029cc519 100644 (file)
--- a/itl/Makefile.am
+++ b/itl/Makefile.am
@@ -6,3 +6,5 @@ icinga2itl_DATA = \
        service.conf \
        service-common.conf \
        standalone.conf
+
+EXTRA_DIST = $(icinga2itl_DATA)

diff --git a/lib/base/exception.cpp b/lib/base/exception.cpp
index 11233b63e4aed91716ea9fa5914cfa90463de2de..63a811f6362c4c2f1f058b1546f777565ceae4d1 100644 (file)
--- a/lib/base/exception.cpp
+++ b/lib/base/exception.cpp
@@ -23,7 +23,7 @@ using namespace icinga;
 
 boost::thread_specific_ptr<StackTrace> Exception::m_LastStackTrace;
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__APPLE__)
 extern "C"
 void __cxa_throw(void *obj, void *pvtinfo, void (*dest)(void *))
 {
@@ -53,7 +53,7 @@ void __cxa_throw(void *obj, void *pvtinfo, void (*dest)(void *))
 
        real_cxa_throw(obj, pvtinfo, dest);
 }
-#endif /* _WIN32 */
+#endif /* !_WIN32 && !__APPLE__ */
 
 StackTrace *Exception::GetLastStackTrace(void)
 {

diff --git a/lib/base/process-unix.cpp b/lib/base/process-unix.cpp
index fb43901114980dbc27a3138ba9f4373c221a6ab2..250e52c30ba41c5b25041a539c1e5165f5b42c9d 100644 (file)
--- a/lib/base/process-unix.cpp
+++ b/lib/base/process-unix.cpp
@@ -27,7 +27,13 @@ using namespace icinga;
 condition_variable Process::m_CV;
 int Process::m_TaskFd;
 Timer::Ptr Process::m_StatusTimer;
+
+#ifndef __APPLE__
 extern char **environ;
+#else /* __APPLE__ */
+#include <crt_externs.h>
+#define environ (*_NSGetEnviron())
+#endif /* __APPLE__ */
 
 void Process::Initialize(void)
 {

diff --git a/lib/config/Makefile.am b/lib/config/Makefile.am
index 60f471514d0ef26043af73c71457c0e71df81f9d..e9cbc3e0b11bc373a376f8b4fe6840726afff6de 100644 (file)
--- a/lib/config/Makefile.am
+++ b/lib/config/Makefile.am
@@ -52,4 +52,6 @@ libconfig_la_LDFLAGS = \
        @VERSION_INFO@
 
 libconfig_la_LIBADD = \
+       $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la

diff --git a/lib/icinga/Makefile.am b/lib/icinga/Makefile.am
index 6698cfb21a7921e42e1782995b3a51a51f520bf8..7ea79040a7d42cf051430b8fcb7036e7c58f4525 100644 (file)
--- a/lib/icinga/Makefile.am
+++ b/lib/icinga/Makefile.am
@@ -73,6 +73,7 @@ libicinga_la_LDFLAGS = \
 
 libicinga_la_LIBADD = \
        $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la \
        ${top_builddir}/lib/remoting/libremoting.la

diff --git a/lib/remoting/Makefile.am b/lib/remoting/Makefile.am
index cb12b5181799b4ec7a7d3274178eeed3c1b0fc65..8be603ebf1dfb62e91c3290151621c3e5a354c96 100644 (file)
--- a/lib/remoting/Makefile.am
+++ b/lib/remoting/Makefile.am
@@ -37,5 +37,7 @@ libremoting_la_LDFLAGS = \
        @VERSION_INFO@
 
 libremoting_la_LIBADD = \
+       $(BOOST_THREAD_LIB) \
+       $(BOOST_SYSTEM_LIB) \
        ${top_builddir}/lib/base/libbase.la \
        ${top_builddir}/lib/config/libconfig.la