BIND 10 master, updated. 67bfb6c60061a86dd0420df77d5cb85af935c634 Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  67bfb6c60061a86dd0420df77d5cb85af935c634 (commit)
       via  ec8977f28f7824c8c0b07180eda806be22110199 (commit)
      from  2e697f95732f976f3ba51a671a0c23d2057f3162 (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 67bfb6c60061a86dd0420df77d5cb85af935c634
Merge: ec8977f28f7824c8c0b07180eda806be22110199 2e697f95732f976f3ba51a671a0c23d2057f3162
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 19:20:02 2011 +0000

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit ec8977f28f7824c8c0b07180eda806be22110199
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 19:19:34 2011 +0000

    [master] need clangpp check in lib/resolve too

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

Summary of changes:
 src/lib/resolve/Makefile.am |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/resolve/Makefile.am b/src/lib/resolve/Makefile.am
index c6f65a4..0b29da4 100644
--- a/src/lib/resolve/Makefile.am
+++ b/src/lib/resolve/Makefile.am
@@ -17,3 +17,13 @@ libresolve_la_SOURCES += response_classifier.cc response_classifier.h
 libresolve_la_SOURCES += recursive_query.cc recursive_query.h
 libresolve_la_LIBADD = $(top_builddir)/src/lib/dns/libdns++.la
 libresolve_la_LIBADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
+
+# Note: the ordering matters: -Wno-... must follow -Wextra (defined in
+# B10_CXXFLAGS)
+libresolve_la_CXXFLAGS = $(AM_CXXFLAGS)
+if USE_CLANGPP
+# For clang++, we need to turn off -Werror completely.
+libresolve_la_CXXFLAGS += -Wno-error
+endif
+libresolve_la_CPPFLAGS = $(AM_CPPFLAGS)
+