BIND 10 trac542, updated. 35ac625edfbc78dde6ccf78f8d577f3d8edadbce [trac542] include source files that depend on gtest to SOURCES only when HAVE_GTEST is yes. also add GTEST_INCLUDES in that case to CPPFLAGS for libutil_unittests.

[BIND 10 source code commits]

The branch, trac542 has been updated
       via  35ac625edfbc78dde6ccf78f8d577f3d8edadbce (commit)
      from  3f27e2dc3c0ce961a95e4791604e3cb12fd43dfa (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 35ac625edfbc78dde6ccf78f8d577f3d8edadbce
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue May 17 14:28:04 2011 -0700

    [trac542] include source files that depend on gtest to SOURCES only
    when HAVE_GTEST is yes.  also add GTEST_INCLUDES in that case to
    CPPFLAGS for libutil_unittests.

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

Summary of changes:
 src/lib/util/unittests/Makefile.am |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index 622887f..efcd15f 100644
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -4,9 +4,15 @@ AM_CXXFLAGS = $(B10_CXXFLAGS)
 lib_LTLIBRARIES = libutil_unittests.la
 libutil_unittests_la_SOURCES = fork.h fork.cc resolver.h
 libutil_unittests_la_SOURCES += newhook.h newhook.cc
-libutil_unittests_la_SOURCES += run_all.h run_all.cc
 libutil_unittests_la_SOURCES += testdata.h testdata.cc
+if HAVE_GTEST
+libutil_unittests_la_SOURCES += run_all.h run_all.cc
 libutil_unittests_la_SOURCES += textdata.h
+endif
+
+if HAVE_GTEST
+libutil_unittests_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+endif
 
 libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libutil.la
 libutil_unittests_la_LIBADD += $(top_builddir)/src/lib/util/io/libutil_io.la