From: Razvan Becheriu <razvan.becheriu@qualitance.com>
Date: Tue, 12 Dec 2017 12:20:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'isc-kea/master' into HEAD
X-Git-Tag: trac5524_base~14^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8abf4ba70245cc9e9cf065522ea51319d7918e3d;p=thirdparty%2Fkea.git

Merge remote-tracking branch 'isc-kea/master' into HEAD
---

8abf4ba70245cc9e9cf065522ea51319d7918e3d
diff --cc Makefile.am
index 1268d3d4b7,2e34d16daf..bbdaa74ce5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -10,7 -10,8 +10,9 @@@ GENHTML=@GENHTML
  DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@
  DISTCHECK_CRYPTO_CONFIGURE_FLAG=@DISTCHECK_CRYPTO_CONFIGURE_FLAG@
  DISTCHECK_BOOST_CONFIGURE_FLAG=@DISTCHECK_BOOST_CONFIGURE_FLAG@
 +OVERALL_COVERAGE_DIR=$(abs_top_builddir)/coverage-cpp-html
+ DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=@DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG@
+ DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=@DISTCHECK_KEA_SHELL_CONFIGURE_FLAG@
  
  DISTCLEANFILES = config.report