BIND 10 master, updated. 687beb26da60ed2ce8e6eb44cd1725aa53f29f55 Merge branch 'trac3267'

[BIND 10 source code commits]

The branch, master has been updated
       via  687beb26da60ed2ce8e6eb44cd1725aa53f29f55 (commit)
       via  210c5d0939516e7ad8250e4ff056f132e4d8963d (commit)
       via  3ff790761f37375de1f9eff59872405fc26e0364 (commit)
      from  35bee74e98a1d769ef7d028ca3ef95f3ac4081b0 (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 687beb26da60ed2ce8e6eb44cd1725aa53f29f55
Merge: 35bee74 210c5d0
Author: Kean Johnston <kean at isc.org>
Date:   Mon Dec 30 10:10:05 2013 +0200

    Merge branch 'trac3267'

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

Summary of changes:
 tests/tools/perfdhcp/Makefile.am                   |    1 -
 tests/tools/perfdhcp/rate_control.cc               |    2 +-
 tests/tools/perfdhcp/test_control.h                |    6 +++---
 tests/tools/perfdhcp/tests/Makefile.am             |    2 +-
 .../tools/perfdhcp/tests/rate_control_unittest.cc  |    2 +-
 5 files changed, 6 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/tests/tools/perfdhcp/Makefile.am b/tests/tools/perfdhcp/Makefile.am
index cfab327..4e2d22b 100644
--- a/tests/tools/perfdhcp/Makefile.am
+++ b/tests/tools/perfdhcp/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/log -I$(top_builddir)/src/lib/log
-AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
diff --git a/tests/tools/perfdhcp/rate_control.cc b/tests/tools/perfdhcp/rate_control.cc
index 06cdd4e..1c2a600 100644
--- a/tests/tools/perfdhcp/rate_control.cc
+++ b/tests/tools/perfdhcp/rate_control.cc
@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <exceptions/exceptions.h>
-#include <tests/tools/perfdhcp/rate_control.h>
+#include "rate_control.h"
 
 namespace isc {
 namespace perfdhcp {
diff --git a/tests/tools/perfdhcp/test_control.h b/tests/tools/perfdhcp/test_control.h
index 3b3cdb7..5a7ef48 100644
--- a/tests/tools/perfdhcp/test_control.h
+++ b/tests/tools/perfdhcp/test_control.h
@@ -15,9 +15,9 @@
 #ifndef TEST_CONTROL_H
 #define TEST_CONTROL_H
 
-#include <tests/tools/perfdhcp/packet_storage.h>
-#include <tests/tools/perfdhcp/rate_control.h>
-#include <tests/tools/perfdhcp/stats_mgr.h>
+#include "packet_storage.h"
+#include "rate_control.h"
+#include "stats_mgr.h"
 
 #include <dhcp/iface_mgr.h>
 #include <dhcp/dhcp6.h>
diff --git a/tests/tools/perfdhcp/tests/Makefile.am b/tests/tools/perfdhcp/tests/Makefile.am
index 31c11ed..6e808c6 100644
--- a/tests/tools/perfdhcp/tests/Makefile.am
+++ b/tests/tools/perfdhcp/tests/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . testdata
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
-AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
+AM_CPPFLAGS += -I$(srcdir)/.. -I$(builddir)/..
 AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_srcdir)/testdata\"
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CXXFLAGS = $(B10_CXXFLAGS)
diff --git a/tests/tools/perfdhcp/tests/rate_control_unittest.cc b/tests/tools/perfdhcp/tests/rate_control_unittest.cc
index 99fc35e..829d37f 100644
--- a/tests/tools/perfdhcp/tests/rate_control_unittest.cc
+++ b/tests/tools/perfdhcp/tests/rate_control_unittest.cc
@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <exceptions/exceptions.h>
-#include <tests/tools/perfdhcp/rate_control.h>
+#include "rate_control.h"
 #include <gtest/gtest.h>