[master] for trac #1247: distcheck should enable gtest when possible

If --with-gtest defined on ./configure line, then do same for distcheck
target.

diff --git a/Makefile.am b/Makefile.am
index b07ef0f1df31c1647ad7da7698608629c4a52002..50aa6b9a2496bcaf5826adc7496a0ca59498020e 100644 (file)
--- 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 2c6cfb1afb56b7f80b135fef5e77b2ec35b6313b..b0f5f45fd47826eb2f90b74ec583051190f7d8c6 100644 (file)
--- 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)