[5524] Transmit premium config to distcheck

diff --git a/Makefile.am b/Makefile.am
index 77ba61b61977018ac0e2ffc4547219edc7da7c8d..2c0733c29ca33c3de61c03dc9811d88091cb1532 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,9 +10,12 @@ 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@
+DISTCHECK_PREMIUM_CONFIGURE_FLAG=@DISTCHECK_PREMIUM_CONFIGURE_FLAG@
+DISTCHECK_CONTRIB_CONFIGURE_FLAG=@DISTCHECK_CONTRIB_CONFIGURE_FLAG@
+
+OVERALL_COVERAGE_DIR=$(abs_top_builddir)/coverage-cpp-html
 
 DISTCLEANFILES = config.report
 
@@ -34,6 +37,12 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG)
 # Keep kea-shell if enabled
 DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_KEA_SHELL_CONFIGURE_FLAG)
 
+# Keep the premium config
+DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_PREMIUM_CONFIGURE_FLAG)
+
+# Keep the contrib config
+DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_CONTRIB_CONFIGURE_FLAG)
+
 dist_doc_DATA = AUTHORS COPYING ChangeLog README
 
 .PHONY: check-valgrind check-valgrind-suppress

diff --git a/configure.ac b/configure.ac
index 34a134a59eb69871522789ef5aca932fdcb5fbfd..3bf520e7c7804feae387605b8fd2adf52b85984d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -74,20 +74,24 @@ AM_COND_IF([DEBUG_ENABLED], [AC_DEFINE([ENABLE_DEBUG], [1], [Enable low-performi
 
 # Include premium configuration
 PREMIUM_DIR=
+DISTCHECK_PREMIUM_CONFIGURE_FLAG=
 AC_DEFUN([AX_PREMIUM],[])
 # m4_sinclude includes the file if it exists at autoreconf time
 m4_sinclude(premium/config.m4)
 m4_sinclude(premium/tier1.m4)
 m4_sinclude(premium/tier2.m4)
 AC_SUBST(PREMIUM_DIR)
+AC_SUBST(DISTCHECK_PREMIUM_CONFIGURE_FLAG)
 AX_PREMIUM
 
 # Include contrib configuration
 # (currently only a provision copied from premium support)
 CONTRIB_DIR=
+DISTCHECK_CONTRIB_CONFIGURE_FLAG=
 AC_DEFUN([AX_CONTRIB],[])
 m4_sinclude(contrib/config.m4)
 AC_SUBST(CONTRIB_DIR)
+AC_SUBST(DISTCHECK_CONTRIB_CONFIGURE_FLAG)
 AX_CONTRIB
 
 # Libtool configuration