mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
If --with-gtest defined on ./configure line, then do same for distcheck
target.
This commit is contained in:
Jeremy C. Reed
2011-10-06 16:00:48 -05:00
parent c96f735cd5
commit 3183039728
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -2,12 +2,16 @@ SUBDIRS = doc src tests
USE_LCOV=@USE_LCOV@ USE_LCOV=@USE_LCOV@
LCOV=@LCOV@ LCOV=@LCOV@
GENHTML=@GENHTML@ GENHTML=@GENHTML@
DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@
DISTCLEANFILES = config.report DISTCLEANFILES = config.report
# When running distcheck target, do not install the configurations # When running distcheck target, do not install the configurations
DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations
# Use same --with-gtest flag if set
DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_GTEST_CONFIGURE_FLAG)
clean-cpp-coverage: clean-cpp-coverage:
@if [ $(USE_LCOV) = yes ] ; then \ @if [ $(USE_LCOV) = yes ] ; then \
$(LCOV) --directory . --zerocounters; \ $(LCOV) --directory . --zerocounters; \

3
configure.ac
View File

@@ -650,6 +650,7 @@ fi
# #
if test "$gtest_path" != "no" if test "$gtest_path" != "no"
then then
DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest=\"$gtest_path\""
if test "$gtest_path" != "yes"; then if test "$gtest_path" != "yes"; then
GTEST_PATHS=$gtest_path GTEST_PATHS=$gtest_path
if test -x "${gtest_path}/bin/gtest-config" ; then if test -x "${gtest_path}/bin/gtest-config" ; then
@@ -690,8 +691,10 @@ else
GTEST_INCLUDES= GTEST_INCLUDES=
GTEST_LDFLAGS= GTEST_LDFLAGS=
GTEST_LDADD= GTEST_LDADD=
DISTCHECK_GTEST_CONFIGURE_FLAG=
fi fi
AM_CONDITIONAL(HAVE_GTEST, test $gtest_path != "no") AM_CONDITIONAL(HAVE_GTEST, test $gtest_path != "no")
AC_SUBST(DISTCHECK_GTEST_CONFIGURE_FLAG)
AC_SUBST(GTEST_INCLUDES) AC_SUBST(GTEST_INCLUDES)
AC_SUBST(GTEST_LDFLAGS) AC_SUBST(GTEST_LDFLAGS)
AC_SUBST(GTEST_LDADD) AC_SUBST(GTEST_LDADD)