[master] Support for Google benchmark added.

# Conflicts:
#	doc/guide/install.xml
#	src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
#	src/lib/dhcpsrv/testutils/lease_file_io.cc

diff --cc configure.ac
Simple merge

diff --cc doc/guide/install.xml
index 5cf88fb8f45a259b2c7a4c1c0ec981f031972686,a174ee7300a9450486fa86ccf8e6626062613270..c07680b589151a7f1029307b1b47d61f018a9a77
--- 1/doc/guide/install.xml
--- 2/doc/guide/install.xml
+++ b/doc/guide/install.xml
@@@ -270,10 -264,10 +270,10 @@@ Debian and Ubuntu
            are a developer planning to contribute to Kea, please fork our Github
            repository and use the "pull request" mechanism to request integration of
            your code. Please consult
 -          <ulink url="https://help.github.com/articles/fork-a-repo/"/> for help on
 +          <uri xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://help.github.com/articles/fork-a-repo/">https://help.github.com/articles/fork-a-repo/</uri> for help on
            how to fork a Github repository.
-           The <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://git.kea.isc.org/~tester/kea/doxygen/">Kea
 -          The <ulink url="kea.isc.org/docs/devel/">Kea
 -          Developer's Guide</ulink> contains more information about the process, as
++          The <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://kea.isc.org/docs/devel/">Kea
 +          Developer's Guide</link> contains more information about the process, as
            well as describing the requirements for contributed code to be accepted by ISC.
          </para>
  
@@@ -321,21 -315,21 +321,21 @@@
            </varlistentry>
  
            <varlistentry>
 -            <term>--with-dhcp-mysql</term>
 +            <term>--with-mysql</term>
              <listitem>
                <simpara>
-                 Build Kea with code to allow it to store leases (and access
-                 host reservations) in a MySQL database.
+                 Build Kea with code to allow it to store leases and
+                 host reservations in a MySQL database.
                </simpara>
              </listitem>
            </varlistentry>
  
            <varlistentry>
 -            <term>--with-dhcp-pgsql</term>
 +            <term>--with-pgsql</term>
              <listitem>
                <simpara>
-                 Build Kea with code to allow it to store leases (and access
-                 host reservations) in a PostgreSQL database.
+                 Build Kea with code to allow it to store leases and
+                 host reservations in a PostgreSQL database.
                </simpara>
              </listitem>
            </varlistentry>
@@@ -347,7 -351,19 +357,20 @@@
                  Google Test framework. This option specifies the path to the
                  gtest source. (If the framework
                  is not installed on your system, it can be downloaded
-                 from <uri xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://code.google.com/p/googletest">https://code.google.com/p/googletest</uri>.)
++                from <uri xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="https://github.com/google/googletest">https://github.com/google/googletest</uri>.)
+                 from <ulink url="https://github.com/google/googletest"/>.)
+               </simpara>
+             </listitem>
+           </varlistentry>
+ 
+           <varlistentry>
+             <term>--with-benchmark, --with-benchmark-source</term>
+             <listitem>
+               <simpara>Enable the building of the database backend
+               benchmarks using the Google Benchmark framework. This
+               option specifies the path to the gtest source. (If the
+               framework is not installed on your system, it can be downloaded
+               from <ulink url="https://github.com/google/benchmark"/>.)
                </simpara>
              </listitem>
            </varlistentry>

diff --cc src/lib/dhcpsrv/cql_host_data_source.cc
Simple merge

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
index 1209677ace018a7489e6e73fee9ea0cae358086b,745fd7f612bcaef64621fac3696e6e80b05e00d6..646e0ee4629ed7079e7ee3479d22b752e453c34c
--- 1/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
--- 2/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
@@@ -18,7 -20,7 +18,9 @@@
  #include <dhcpsrv/tests/generic_host_data_source_unittest.h>
  #include <dhcpsrv/tests/test_utils.h>
  #include <dhcpsrv/testutils/schema.h>
++
 +#include <boost/foreach.hpp>
+ #include <dhcpsrv/testutils/host_data_source_utils.h>
  #include <gtest/gtest.h>
  #include <util/buffer.h>
  

diff --cc src/lib/dhcpsrv/testutils/lease_file_io.cc
index edeec4f85ddfe54d359a1c4deb641eb2fe882dc3,c52740776d695f8e454af950cff6574a67079aa4..71cab527026460d2ed52da04ecbb9c4e2ed130bb
--- 1/src/lib/dhcpsrv/tests/lease_file_io.cc
--- 2/src/lib/dhcpsrv/testutils/lease_file_io.cc
+++ b/src/lib/dhcpsrv/testutils/lease_file_io.cc
@@@ -4,9 -4,7 +4,8 @@@
  // License, v. 2.0. If a copy of the MPL was not distributed with this
  // file, You can obtain one at http://mozilla.org/MPL/2.0/.
  
- 
- #include <dhcpsrv/tests/lease_file_io.h>
 +#include <config.h>
+ #include <dhcpsrv/testutils/lease_file_io.h>
  #include <fstream>
  #include <sstream>
  

diff --cc src/share/database/scripts/cql/dhcpdb_create.cql
Simple merge