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

[BIND 10 source code commits]

The branch, master has been updated
       via  c1d2bae691446b1fb44d3281092a7529f2f4f648 (commit)
       via  5e6de42e41584afd09a579b08d25902c9db88927 (commit)
      from  b39ac098a37803588a3a801d91b85170ddaa7137 (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 c1d2bae691446b1fb44d3281092a7529f2f4f648
Merge: 5e6de42e41584afd09a579b08d25902c9db88927 b39ac098a37803588a3a801d91b85170ddaa7137
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed May 25 15:21:00 2011 -0500

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

commit 5e6de42e41584afd09a579b08d25902c9db88927
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed May 25 15:19:43 2011 -0500

    [master] make sure generated resolverdef.h header is also found
    
    This was noticed on the distcheck build.

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

Summary of changes:
 src/bin/resolver/tests/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/resolver/tests/Makefile.am b/src/bin/resolver/tests/Makefile.am
index 3b5c197..366fb94 100644
--- a/src/bin/resolver/tests/Makefile.am
+++ b/src/bin/resolver/tests/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/bin
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc
+AM_CPPFLAGS += -I$(top_builddir)/src/bin/resolver
 AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(top_srcdir)/src/lib/testutils/testdata\"
 AM_CPPFLAGS += -DTEST_DATA_BUILDDIR=\"$(abs_top_builddir)/src/lib/testutils/testdata\"
 AM_CPPFLAGS += $(BOOST_INCLUDES)