BIND 10 trac542, updated. 6ea285d4f7cf6a9fd18bd9a3811944fc02d0e34c [trac542] ChangeLog entry for Trac 542

[BIND 10 source code commits]

The branch, trac542 has been updated
       via  6ea285d4f7cf6a9fd18bd9a3811944fc02d0e34c (commit)
       via  1aa773d84cd6431aa1483eb34a7f4204949a610f (commit)
      from  5519b6cb34e655c96dca4ec8be2a3eabda941f3c (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 6ea285d4f7cf6a9fd18bd9a3811944fc02d0e34c
Author: Stephen Morris <stephen at isc.org>
Date:   Tue May 24 13:02:46 2011 +0100

    [trac542] ChangeLog entry for Trac 542

commit 1aa773d84cd6431aa1483eb34a7f4204949a610f
Author: Stephen Morris <stephen at isc.org>
Date:   Tue May 24 12:31:49 2011 +0100

    [trac542] Correct problem with "make distcheck"
    
    AM_CPPFLAGS was only being used in a test build, so "make distcheck"
    was failing.  This has been corrected.

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

Summary of changes:
 ChangeLog                          |   10 +++++++++-
 src/lib/util/unittests/Makefile.am |    3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index e44caa2..4e953be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
+244.	[func] 		stephen
+	In unit tests, allow the choice of whether unhandled exceptions are
+	caught in the unit test program (and details printed) or allowed to
+	propagate to the default exception handler.  See the bind10-dev thread
+	https://lists.isc.org/pipermail/bind10-dev/2011-January/001867.html
+	for more details.
+	(Trac #542, git 1aa773d84cd6431aa1483eb34a7f4204949a610f)
+
 243.	[func]*		feng
 	Add optional hmac algorithm SHA224/384/812.
-	(Trac#782,git 77d792c9d7c1a3f95d3e6a8b721ac79002cd7db1).
+	(Trac#782, git 77d792c9d7c1a3f95d3e6a8b721ac79002cd7db1)
 
 bind10-devel-20110519 released on May 19, 2011
 
diff --git a/src/lib/util/unittests/Makefile.am b/src/lib/util/unittests/Makefile.am
index efcd15f..83235f2 100644
--- a/src/lib/util/unittests/Makefile.am
+++ b/src/lib/util/unittests/Makefile.am
@@ -10,8 +10,9 @@ libutil_unittests_la_SOURCES += run_all.h run_all.cc
 libutil_unittests_la_SOURCES += textdata.h
 endif
 
+libutil_unittests_la_CPPFLAGS = $(AM_CPPFLAGS)
 if HAVE_GTEST
-libutil_unittests_la_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
+libutil_unittests_la_CPPFLAGS += $(GTEST_INCLUDES)
 endif
 
 libutil_unittests_la_LIBADD  = $(top_builddir)/src/lib/util/libutil.la