[checkmk-commits] Use our own RE2 if available.

Module: check_mk Branch: master Commit: 1f4d48ad42bc34f21acba637c37d16cf2b035d4a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1f4d48ad42bc34… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri Feb 9 09:14:17 2018 +0100 Use our own RE2 if available. Change-Id: Ifbb6894703702d3ae4becdfd93cdf75194908b99 --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a93b3fd..4f46999 100644 --- a/Makefile +++ b/Makefile @@ -423,6 +423,7 @@ ar-lib compile config.guess config.sub install-sh missing depcomp: configure.ac autoreconf --install --include=m4 touch ar-lib compile config.guess config.sub install-sh missing depcomp +# TODO(sp): We should really detect and use our own packages in a less hacky way... config.status: $(DIST_DEPS) @echo "Build $@ (newer targets: $?)" @if test -f config.status; then \ @@ -441,8 +442,15 @@ config.status: $(DIST_DEPS) else \ RRD_OPT="DUMMY2=" ; \ fi ; \ - echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" \"$$BOOST_OPT\" \"$$RRD_OPT\"" ; \ - ./configure CXXFLAGS="$(CXX_FLAGS)" "$$BOOST_OPT" "$$RRD_OPT" ; \ + if test -d ../re2/destdir ; then \ + RE2_OPT="--with-re2=$(abspath ../re2/destdir)" ; \ + elif test -d omd/packages/re2/destdir ; then \ + RE2_OPT="--with-re2=$(abspath omd/packages/re2/destdir)" ; \ + else \ + RE2_OPT="DUMMY3=" ; \ + fi ; \ + echo "configure CXXFLAGS=\"$(CXX_FLAGS)\" \"$$BOOST_OPT\" \"$$RRD_OPT\" \"$$RE2_OPT\"" ; \ + ./configure CXXFLAGS="$(CXX_FLAGS)" "$$BOOST_OPT" "$$RRD_OPT" "$$RE2_OPT" ; \ fi configure: $(CONFIGURE_DEPS)