From a4df0209d9fd33ebc622293c8703829136ac79d7 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sat, 15 Sep 2012 12:53:38 +0200 Subject: [PATCH 1/3] drop broken example config install --- configure.ac | 1 - icinga-app/Makefile.am | 3 --- 2 files changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index dd99c5000..2cf92a89d 100644 --- a/configure.ac +++ b/configure.ac @@ -76,7 +76,6 @@ components/demo/Makefile components/replication/Makefile docs/Doxyfile icinga-app/Makefile -icinga-app/config/Makefile lib/Makefile lib/base/Makefile lib/config/Makefile diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am index e5fc0887d..1969812c0 100644 --- a/icinga-app/Makefile.am +++ b/icinga-app/Makefile.am @@ -1,8 +1,5 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = \ - config - bin_PROGRAMS = \ icinga From 159e5c79662bacd6ae4c5e0a29c358b1c833149c Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sat, 15 Sep 2012 13:12:03 +0200 Subject: [PATCH 2/3] s/cibsync/replication/g in icingaapplication lib, loading the right component --- lib/icinga/icingaapplication.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/icinga/icingaapplication.cpp b/lib/icinga/icingaapplication.cpp index 9d7f91096..f875657fa 100644 --- a/lib/icinga/icingaapplication.cpp +++ b/lib/icinga/icingaapplication.cpp @@ -34,13 +34,13 @@ const String IcingaApplication::DefaultStatePath = "icinga.state"; IcingaApplication::IcingaApplication(const Dictionary::Ptr& serializedUpdate) : Application(serializedUpdate) { - /* load cibsync config component */ - ConfigItemBuilder::Ptr cibsyncComponentConfig = boost::make_shared(); - cibsyncComponentConfig->SetType("Component"); - cibsyncComponentConfig->SetName("cibsync"); - cibsyncComponentConfig->SetLocal(true); - cibsyncComponentConfig->Compile()->Commit(); - cibsyncComponentConfig.reset(); + /* load replication config component */ + ConfigItemBuilder::Ptr replicationComponentConfig = boost::make_shared(); + replicationComponentConfig->SetType("Component"); + replicationComponentConfig->SetName("replication"); + replicationComponentConfig->SetLocal(true); + replicationComponentConfig->Compile()->Commit(); + replicationComponentConfig.reset(); /* load convenience config component */ ConfigItemBuilder::Ptr convenienceComponentConfig = boost::make_shared(); From a55c35cd658bb82481709e2ae3c764f0b01a4f6a Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Sat, 15 Sep 2012 13:22:40 +0200 Subject: [PATCH 3/3] set boost required to 1.42 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2cf92a89d..3de936e2d 100644 --- a/configure.ac +++ b/configure.ac @@ -51,7 +51,7 @@ AM_PROG_LEX AC_PROG_YACC AC_PROG_LIBTOOL AX_CXX_GCC_ABI_DEMANGLE -AX_BOOST_BASE([1.46], [], [AC_MSG_ERROR([You need the Boost headers and libraries in order to build this application])]) +AX_BOOST_BASE([1.42], [], [AC_MSG_ERROR([You need the Boost headers and libraries in order to build this application])]) AX_BOOST_SIGNALS AX_BOOST_THREAD AX_BOOST_SYSTEM