BIND 10 master, updated. 31830397285a50d1636622b58d04fffc7ca883ae [master] for trac #1247: distcheck should enable gtest when possible

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Oct 6 21:02:46 UTC 2011


The branch, master has been updated
       via  31830397285a50d1636622b58d04fffc7ca883ae (commit)
      from  c96f735cd5bbbd8be3c32e7d40f264ebfa889be5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 31830397285a50d1636622b58d04fffc7ca883ae
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Thu Oct 6 16:00:48 2011 -0500

    [master] for trac #1247: distcheck should enable gtest when possible
    
    If --with-gtest defined on ./configure line, then do same for distcheck
    target.

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am  |    4 ++++
 configure.ac |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index b07ef0f..50aa6b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,16 @@ SUBDIRS = doc src tests
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@
 GENHTML=@GENHTML@
+DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@
 
 DISTCLEANFILES = config.report
 
 # When running distcheck target, do not install the configurations
 DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations
 
+# Use same --with-gtest flag if set
+DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_GTEST_CONFIGURE_FLAG)
+
 clean-cpp-coverage:
 	@if [ $(USE_LCOV) = yes ] ; then \
 		$(LCOV) --directory . --zerocounters; \
diff --git a/configure.ac b/configure.ac
index 2c6cfb1..b0f5f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,6 +650,7 @@ fi
 #
 if test "$gtest_path" != "no"
 then
+	DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=\"$gtest_path\""
 	if test "$gtest_path" != "yes"; then
 		GTEST_PATHS=$gtest_path
 		if test -x "${gtest_path}/bin/gtest-config" ; then
@@ -690,8 +691,10 @@ else
 	GTEST_INCLUDES=
 	GTEST_LDFLAGS=
 	GTEST_LDADD=
+	DISTCHECK_GTEST_CONFIGURE_FLAG=
 fi
 AM_CONDITIONAL(HAVE_GTEST, test $gtest_path != "no")
+AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
 AC_SUBST(GTEST_INCLUDES)
 AC_SUBST(GTEST_LDFLAGS)
 AC_SUBST(GTEST_LDADD)




More information about the bind10-changes mailing list