BIND 10 #1247: distcheck should enable gtest when possible

[BIND 10 Development]

#1247: distcheck should enable gtest when possible
-------------------------------------+-------------------------------------
                   Reporter:         |                 Owner:  jreed
  jinmei                             |                Status:  assigned
                       Type:         |             Milestone:
  enhancement                        |  Sprint-20111011
                   Priority:  major  |            Resolution:
                  Component:  build  |             Sensitive:  0
  system                             |           Sub-Project:  Core
                   Keywords:         |  Estimated Difficulty:  2
            Defect Severity:  N/A    |           Total Hours:  0
Feature Depending on Ticket:         |
        Add Hours to Ticket:  0      |
                  Internal?:  0      |
-------------------------------------+-------------------------------------

Comment (by jreed):

 {{{
 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 1cb0bb0..254199c 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)
 }}}

 I plan on pushing the above to master soon. It will pass the setting from
 initial configure line to the distcheck's configure line.

-- 
Ticket URL: <http://bind10.isc.org/ticket/1247#comment:4>
BIND 10 Development <http://bind10.isc.org>
BIND 10 Development