[checkmk-commits] Check_MK Git: check_mk: FIX: Compile livecheck also if diet libc is missing

Module: check_mk Branch: master Commit: 491f544c2d7c5274691245463cd5dd3c90264b1a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=491f544c2d7c52… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Jul 6 14:03:24 2012 +0200 FIX: Compile livecheck also if diet libc is missing --- ChangeLog | 4 ++++ livestatus/src/Makefile.am | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8cdad1d..2eb3c72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,13 @@ 1.2.0p3: Checks & Agents: * mssql_backup: Fixed problems with datetime/timezone calculations + BI: * Great speed up of rule compilation in large environments + Livecheck: + * FIX: Compile livecheck also if diet libc is missing + 1.2.0p2: Core: * simulation_mode: legacy_checks, custom_checks and active_checks diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index 0c69f99..6c59c91 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -51,9 +51,11 @@ livestatus_so_SOURCES = \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ ContactgroupsColumn.cc opids.cc auth.cc livechecking.c -if HAVE_DIET livecheck: livecheck.c strutil.cc check_icmp.c +if HAVE_DIET diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ +else + $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^ endif livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC