[checkmk-commits] Fixed Boost versionitis.

Module: check_mk Branch: master Commit: 0cc0a4da09f6e98748e0935adcd0dcbb1914e714 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cc0a4da09f6e9… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed May 17 14:27:35 2017 +0200 Fixed Boost versionitis. Change-Id: I72bb14cce2a576d82017cf341b84689a0ad6d9b9 --- configure.ac | 1 - livestatus/src/Makefile.am | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 40487a4..b9ef93e 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,6 @@ AC_DEFINE([_GLIBCXX_REGEX_STATE_LIMIT], [2500], [the maximum number of states the regex NFA can have]) AC_DEFINE([BOOST_SYSTEM_NO_DEPRECATED], [1], [we do not want any old stuff]) -AC_DEFINE([BOOST_ERROR_CODE_HEADER_ONLY], [1], [avoid linking with boost_system]) # HACKING ALERT: automake can't really handle optional subdirectories, so we # have to do this in a slightly hacky way by using M4's silent includes. diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index efdf542..c58ac10 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -163,7 +163,7 @@ liblivestatus_a_CXXFLAGS = -fPIC livestatus.o: $(liblivestatus_a_OBJECTS) # Note: libstdc++fs is only available as a static library, so we are lucky - $(CXX) $(LDFLAGS) -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ + $(CXX) $(LDFLAGS) -shared $^ -o $@ -lstdc++fs -lpthread -static-libstdc++ @BOOST_LDFLAGS@ -lboost_system # To make sure we can dlopen() our NEB later $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) -c NagiosMockup.cc -o NagiosMockup.o $(CXX) $(liblivestatus_a_CXXFLAGS) $(CXXFLAGS) NagiosMockup.o $@ -o NagiosMockup