Merge ~ahasenack/ubuntu/+source/isc-kea:focal-isc-kea-bump-1.6.1 into ubuntu/+source/isc-kea:ubuntu/devel

[Andreas Hasenack]

PPA: https://launchpad.net/~ahasenack/+archive/ubuntu/isc-kea-1.6.x

We are going ahead of debian for this one, to land ubuntu on the stable 1.6.x series track. The EOL of 1.6 is stated as "when 2.0 is released", with no date there (https://www.isc.org/kea/). There is also this with suggestive dates: https://kb.isc.org/docs/aa-00896#kea

In any case, 1.6 will be supported for longer than 1.5, and has more interesting features like a database backend.

This will all be proposed to debian as well. Perhaps not at the same time (dealing with two different MPs about the same thing can be hard).

I had to do quite a few changes to get it working well. What I tested:
- HA setup
- MySQL and Postgresql backends (v8 and v12 respectively)
- single server setup

Lintian is flagging a ton of issues, but it was already doing it before. These should be picked one by one in sets. I'll file bugs for these, and other remaining issues which I'm not addressing in this MP:
- add DEP8 tests. A simple smoke test isn't hard. One that just checks the REST server to see if it's alive, and that the services are running.
- move control sockets out of /tmp and into /run or some other place more appropriate
- logrotate: the daemon itself can do rotation from what I could see, but I didn't try it. It has to be enabled explicitly in the configuration file. We could do that (change the config), or ship a logrotate config file.
- the shell vars in the systemd service files seem to be unneeded. I quickly tried without them, and things were working apparently, but a more thorough check is needed before dropping them.

Here is a kea-dhcp4.conf file I used to test HA: https://paste.ubuntu.com/p/nY7KJCcPhM/

Put that in a server called kea2, and the same file on a server called kea1 and update "this-server-name" to say "kea1" instead of kea1. The other change is in kea-ctrl-agent.conf, have it listen on 0.0.0.0 instead of 127.0.0.1 (on both kea1 and kea2).

This MP has many commits, I hope they are self explanatory. In the likely event they are not, please ask, and I can enhance the changelog, so that we don't suffer too much when rebasing back on top of debian.

[Christian Ehrhardt  (paelzer)]

Sorry this review took a while (well from your POV it might have been over-night no matter how long it took :-) ).

Generally looks good already, a few requests for info or changes at the bottom of this.

Changelog:
- [√] old content matches Debian
- [√] changelog entry correct version and targeted codename
- [√] changelog entries correct
- [√] update-maintainer has been run

Actual changes:
- [√] upstream changes look ok
      I have double checked the orig-tarball without an import yet
      I compared your PPA vs upstream vs git and they match.
- [√] no further upstream version to consider (1.7 is dev, ok to take 1.6)
- [√] no "new" debian changes to consider as we don't merge but go ahead

Old Delta:
- [√] dropped changes are ok to be dropped
- [√] nothing else to drop
- [√] changes forwarded to debian (I know you are in contact, let that be enough for now)

New Delta:
- [√] I went through the new changes one by one and they seem ok, some feedback detail below

Build/Test:
- [√] build is ok, but x86 only
- [√] verified PPA package installs/uninstalls
- [√] autopkgtest against the PPA package passes
- [√] sanity checks test fine

TODOs:
- the bugs 1858347 and 1809262 need to be mentioned in the changelog
- This is "Architecture: any" but I see only amd64 test builds, before a final upload probably better also test cross arch build?
- debian/patches/mysql8-mybool-ubuntu.patch should get LP: #1795314 in its header
- for "enable generate messages" the reasoning seems off, when reading
  https://kea.readthedocs.io/en/latest/arm/install.html
  https://kb.isc.org/docs/kea-build-on-ubuntu
  It seems a better reason would be "to re-generate docs on build" or something like it.
  If we have another reason we should mention that one
- --enable-perfdhcp: why is it default off is it known to be broken or bad in anyway?
  I found upstream 8ee2c24be1383819fe1d79a5c75e993cbbc5e243 cdc89731ccb2b4aed2c01573bf02ffdd71622be5 and https://gitlab.isc.org/isc-projects/kea/issues/340 yet they just state the fact, but no reason :-/
  If you know a reason please add it.
- your PPAs seem to have proposed disabled I see in buildlog libboost-system1.67.0 linked but focal proposed has 1.71.0.0ubuntu1. Please make sure it builds and tests against the new version as well

review: Needs Fixing

[Andreas Hasenack (ahasenack)]

> Sorry this review took a while (well from your POV it might have been over-
> night no matter how long it took :-) ).
>
> Generally looks good already, a few requests for info or changes at the bottom
> of this.
>
> Changelog:
> - [√] old content matches Debian
> - [√] changelog entry correct version and targeted codename
> - [√] changelog entries correct
> - [√] update-maintainer has been run
>
> Actual changes:
> - [√] upstream changes look ok
> I have double checked the orig-tarball without an import yet
> I compared your PPA vs upstream vs git and they match.
> - [√] no further upstream version to consider (1.7 is dev, ok to take 1.6)
> - [√] no "new" debian changes to consider as we don't merge but go ahead
>
> Old Delta:
> - [√] dropped changes are ok to be dropped
> - [√] nothing else to drop
> - [√] changes forwarded to debian (I know you are in contact, let that be
> enough for now)
>
> New Delta:
> - [√] I went through the new changes one by one and they seem ok, some
> feedback detail below
>
> Build/Test:
> - [√] build is ok, but x86 only
> - [√] verified PPA package installs/uninstalls
> - [√] autopkgtest against the PPA package passes
> - [√] sanity checks test fine
>
> TODOs:
> - the bugs 1858347 and 1809262 need to be mentioned in the changelog

They were kind of fixed upstream, so I put them next to the "new upstream release" entry.

> - This is "Architecture: any" but I see only amd64 test builds, before a final
> upload probably better also test cross arch build?

Ups, they were in the ppa I was using for testing, just not this one. Fixed.

> - debian/patches/mysql8-mybool-ubuntu.patch should get LP: #1795314 in its
> header

done

> - for "enable generate messages" the reasoning seems off, when reading
> https://kea.readthedocs.io/en/latest/arm/install.html
> https://kb.isc.org/docs/kea-build-on-ubuntu
> It seems a better reason would be "to re-generate docs on build" or
> something like it.
> If we have another reason we should mention that one

When looking for users of the message compiler, I found this bug: https://github.com/zorun/kea-hook-runscript/issues/15

They fixed it another way, but it shows a third party could need it. I thought about putting it in the kea-dev package, but that would introduce a package transition scenario which is a potential delta I wasn't ready to take on, specially if we have to revert it later.

> - --enable-perfdhcp: why is it default off is it known to be broken or bad in
> anyway?
> I found upstream 8ee2c24be1383819fe1d79a5c75e993cbbc5e243
> cdc89731ccb2b4aed2c01573bf02ffdd71622be5 and https://gitlab.isc.org/isc-
> projects/kea/issues/340 yet they just state the fact, but no reason :-/
> If you know a reason please add it.

I figure it's not something you would run frequently, that's why it's optional. Maybe we could put it in another package, but that would also introduce a package transition delta which we might not need, depending on what debian will do eventually. I haven't run the tool myself.

> - your PPAs seem to have proposed disabled I see in buildlog libboost-
> system1.67.0 linked but focal proposed has 1.71.0.0ubuntu1. Please make sure
> i...

[Christian Ehrhardt  (paelzer)]

Upstreams .deb for isc-kea-admin 1.6.1-isc0042520191119145256 has perfdhcp as well, so it seems to be ok.

[Christian Ehrhardt  (paelzer)]

Thanks for explaining all the details and fixing up the things I pointed out!
Changes all LGTM now and build on all arches just completed.

+1

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 450a875fd71f61bd0ba666782c5dc69feb253f33

$ git push pkg upload/1.6.1-0ubuntu1
Enumerating objects: 2124, done.
Counting objects: 100% (2122/2122), done.
Delta compression using up to 4 threads
Compressing objects: 100% (581/581), done.
Writing objects: 100% (1474/1474), 2.37 MiB | 279.00 KiB/s, done.
Total 1474 (delta 955), reused 1373 (delta 890)
remote: Resolving deltas: 100% (955/955), completed with 483 local objects.
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/isc-kea
 * [new tag] upload/1.6.1-0ubuntu1 -> upload/1.6.1-0ubuntu1

$ dput ubuntu ../isc-kea_1.6.1-0ubuntu1_source.changes
Checking signature on .changes
gpg: ../isc-kea_1.6.1-0ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../isc-kea_1.6.1-0ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading isc-kea_1.6.1-0ubuntu1.dsc: done.
  Uploading isc-kea_1.6.1.orig.tar.gz: done.
  Uploading isc-kea_1.6.1-0ubuntu1.debian.tar.xz: done.
  Uploading isc-kea_1.6.1-0ubuntu1_source.buildinfo: done.
  Uploading isc-kea_1.6.1-0ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/AUTHORS b/AUTHORS
index 5b7aa77..4e8812e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,18 +5,24 @@ Primary developers:
  - Tomek Mrugalski (lead developer: DHCPv4, DHCPv6 components, prefix
                     delegation, memfile, database interface, core libdhcp++,
                     host reservation, MAC extraction in DHCPv6,
-                    statistics manager, kea-shell, netconf)
+                    statistics manager, kea-shell, netconf, flex/bison
+                    parsers, flex-id, documentation)
  - Stephen Morris (Hooks, MySQL)
  - Marcin Siodelski (DHCPv4, DHCPv6 components, options handling, perfdhcp,
                      host reservation, lease file cleanup, lease expiration,
-                     control agent, shared networks, high availability)
- - Thomas Markwalder (DDNS, user_chk, global host reservations)
+                     control agent, shared networks, high availability,
+                     config backend)
+ - Thomas Markwalder (DDNS, user_chk, global host reservations, stat commands,
+                     congestion handling, config backend)
  - Jeremy C. Reed (documentation, build system, testing, release engineering)
  - Wlodek Wencel (testing, release engineering)
  - Francis Dupont (crypto, flex/bison parsers, perfdhcp, control agent,
-                   radius, netconf)
+                   radius, netconf, config backend)
+ - Brian Reid     (logo design)
  - Shawn Routhier (lease file cleanup)
- - Michal Nowikowski (testing)
+ - Michal Nowikowski (testing, hammer, release engineering)
+ - Razvan Becheriu (cassandra, sysrepo)
+ - Suzanne Goldlust (documentation)
 
 Primary area of work mentioned in parentheses. The list is in a roughly
 chronological order.
@@ -70,6 +76,8 @@ We have received the following contributions:
 
  - Adam Osuchowski, Silesian University of Technology
    2014-09: Examples corrected in Kea ARM
+   2019-02: Hooks installation directory fixed.
+   2019-02: Possible syntax error in keactrl fixed.
 
  - Nicolas Chaigneau, Capgemini
    2014-09: Fix for interfaces with multiple addresses in perfdhcp
@@ -186,22 +194,10 @@ We have received the following contributions:
 
  - Franciszek Gorski
    2018-10: Makefile bug fixed
+   2019-07: Statistics enhancements
 
  - Suzanne Goldlust
    2018-10: API documentation
 
  - lpaserati, Thorsten Krohn
    2018-11: Two bugfixes in kea-admin
-
-Kea uses log4cplus (http://sourceforge.net/projects/log4cplus/) for logging,
-Boost (http://www.boost.org/) library for almost everything, and can use Botan
-(http://botan.randombit.net/) or OpenSSL (https://www.openssl.org/) for
-cryptographic operations. It can also optionally use PostgreSQL
-(http://www.postgresql.org/) and/or MySQL (http://www.mysql.com/) and/or
-Cassandra (http://cassandra.apache.org/) as a database.
-Sysrepo (http://www.sysrepo.org/) and libyang (https://github.com/CESNET/libyang)
-required when netconf is used as configuration backend.
-
-Kea can use googletest for unit-tests (https://github.com/google/googletest).
-
-Kea uses ISC Forge (https://github.com/isc-projects/forge/) for conformance testing.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..d56757a
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,251 @@
+# Kea Contributor's Guide
+
+So you found a bug in Kea or plan to develop an extension and want to send us a patch? Great! This
+page will explain how to contribute your changes smoothly.
+
+Here's a quick list of how to contribute a patch:
+
+1. **create account** on [gitlab](https://gitlab.isc.org)
+2. **open an issue** in [Kea project](https://gitlab.isc.org/isc-projects/kea/issues/new), make sure
+   it describes what you want to fix and **why**
+3. **ask someone from the ISC team to give you permission to fork Kea** (ask @tomek, @vicky, @ondrej
+   or @godfryd or basically anyone from the Kea dev team)
+4. **fork Kea code**: go to Kea project page, click [Fork button](https://gitlab.isc.org/isc-projects/kea/forks/new).
+   If you can't, you didn't complete step 3.
+5. **Implement your fix or feature, push code** to your repo. Make sure it compiles, has unit-tests,
+   is documented and does what it's supposed to do.
+6. **Open Merge Request**: go to Kea project [merge requests page](https://gitlab.isc.org/isc-projects/kea/merge_requests),
+   click [New merge request](https://gitlab.isc.org/isc-projects/kea/merge_requests/new). If you
+   don't see the button, you didn't complete step 3.
+7. **Participate in the code review**: Once you submit the MR, someone from ISC will eventually get
+   to the issue and will review your code. Please make sure you respond to comments. It's likely
+   you'll be asked to update the code.
+
+For a much more detailed description with details, see the text below.
+
+## Writing a patch
+
+Before you start working on a patch or a new feature, it is a good idea to discuss it first with Kea
+developers.  You can post your questions to the [kea-dev](https://lists.isc.org/mailman/listinfo/kea-dev)
+or [kea-users](https://lists.isc.org/mailman/listinfo/kea-users) mailing lists. The kea-users is
+intended for users who are not interested in the internal workings or development details of Kea: it
+is OK to ask for feedback regarding new design or the best proposed solution to a certain
+problem. This is the best place to get user's feedback. The internal details, questions about the
+code and its internals are better asked on kea-dev.
+
+OK, so you have written a patch? Great! Before you submit it, make sure that your code
+compiles. This may seem obvious, but there's more to it. You have surely checked that it compiles on
+your system, but Kea is a portable software. Besides Linux, it is compiled and used on relatively
+uncommon systems like OpenBSD. Will your code compile and work there? What about endianness? It is
+likely that you used a regular x86 architecture machine to write your patch, but the software is
+expected to run on many other architectures. You may take a look at [system specific build
+notes](https://kb.isc.org/docs/installing-kea). For a complete list of systems we build on, you may
+take a look at the [Jenkins build farm](https://jenkins.isc.org/).
+
+Does your patch conform to [Kea coding
+guidelines](https://gitlab.isc.org/isc-projects/kea/wikis/coding-guidelines)?  You can submit a
+patch that does not adhere to them, but that will reduce its chances of being accepted.  If the
+deviations are minor, one of the Kea engineers who does the review will likely fix the issues.
+However, if there are lots of issues, the reviewer may simply reject the patch and ask you to fix it
+before re-submitting.
+
+## Running unit-tests
+
+One of the ground rules in Kea development is that every piece of code has to be tested. We now have
+an extensive set of unit-tests for almost every line of code. Even if you are fixing something
+small, like a single line fix, you are encouraged to write unit-tests for that change. That is even
+more true for new code: if you write a new function, method or a class, you definitely should write
+unit-tests for it.
+
+To ensure that everything is tested, ISC uses a development method called [Test Driven Development
+(TDD)](https://en.wikipedia.org/wiki/Test-driven_development). In TDD, a feature is developed
+alongside the tests, preferably with the tests being written first. In detail, a test is written for
+a small piece of functionality and run against the existing code. (In the case where the test is a
+unit test for a function, it would be run against an empty (unimplemented) function.) The test
+should fail.  A minimal amount of code is then written, just enough to get the test to pass. Then
+the process is repeated for the next small piece of functionality. This continues until all the
+functionality has been implemented.
+
+This approach has two advantages:
+
+ - By writing a test first and then only enough code to pass the test, that code is fully tested. By
+   repeating this process until the feature is fully implemented, all the code gets test
+   coverage. You avoid the situation where not enough tests have been written to check all the
+   code.
+
+ - By running the test before the code implementing the function is written and observing the test
+   fail, you can detect the situation where a bug in the test code will cause it to pass regardless
+   of the code being tested.
+
+Initially, some people unfamiliar with that approach react with "but my change is simple and I
+tested that it works". That approach is both insufficient and short-sighted. It is insufficient,
+because manual testing is by definition laborious and can't really be done on the multitude of
+systems we run Kea on. It is short-sighted, because even with your best intentions you will not be
+able to dedicate any significant amount of time for repeated testing of your improved code. The old
+ISC DHCP has two decades of history behind it and we hope to make Kea last similar time span. Over
+such long periods, code tends to be refactored several times. The change you made may be affected by
+some other change or by the code that hasn't been written yet.
+
+See Building Kea with Unit Tests for instructions on how to run unit-tests. If you happen to touch
+any database related code, make sure you compile your code with –with-mysql, –with-pgsql and/or
+–with-cql as needed. For example, if you change something substantial, make sure the other
+compilation options still work.
+
+If you happen to add new files or have modified any Makefile.am files, it is also a good idea to
+check if you haven't broken the distribution process:
+
+```bash
+make distcheck
+```
+
+There are other useful switches which can be passed to configure. It is always a good idea to use
+`–enable-logger-checks`, which does sanity checks on logger parameters. Use `–-enable-debug` to
+enable various additional consistency checks that reduce performance but help during development. If
+you happen to modify anything in the documentation, use `–-enable-generate-docs`. If you are
+modifying DHCP code, you are likely to be interested in enabling a non-default database backends for
+DHCP. Note that if the backend is not enabled, the database-specific unit-tests are skipped.  To
+enable the MySQL backend, use the switch `–with-mysql`; for PostgreSQL, use `–with-pgsql` and for
+Cassandra use `--with-cql`. A complete list of all switches can be obtained with the command:
+
+```bash
+./configure --help
+```
+
+## Submitting Merge Request (also known as sending your patch the right way)
+
+The first step in writing the patch or new feature should be to get the source code from our Git
+repository.  The procedure is very easy and is [explained
+here](https://gitlab.isc.org/isc-projects/kea/wikis/processes/gitlab-howto).  While it is possible
+to provide a patch against the latest stable release, it makes the review process much easier if it
+is for latest code from the Git master branch.
+
+ISC uses [gitlab](https://gitlab.isc.org) to manage its source code. While we also maintain presence
+on [github](https://github.com/isc-projects/kea), the process of syncing gitlab to github is mostly
+automated and Kea devs rarely look at github.
+
+ISC's gitlab has been a target for spammers in the past, so it is now set up defensively. In
+particular, new users can't fork the code on their own and it requires someone from ISC to manually
+grant the ability to fork projects.  Fortunately, this is easy to do and we glady do this for anyone
+who asks and provides a good reason. "I'd like to fix bug X or develop feature Y" is an excellent
+reason. The best place for asking is either kea-dev or asking in a comment in your issue. Make sure
+you put a name tag (@tomek, @godfryd, @vicky or @ondrej). When you write a comment in an issue or
+merge request and add a name tag on it, the user is automatically notified.
+
+Once you fork the Kea code in gitlab, you have your own copy and you can commit your changes there
+and push them to your copy of Kea repo. Once you feel that your patch is ready, go to Kea project
+and [submit a Merge Request](https://gitlab.isc.org/isc-projects/kea/merge_requests/new).
+
+If you can't access this link or don't see New Merge Request button on the [merge requests
+page](https://gitlab.isc.org/isc-projects/kea/merge_requests), please ask on kea-dev and someone
+will help you out.
+
+## Send Pull Request on github
+
+If you can't send the patch on gitlab, the next best preferred way is to send pull request (PR) on
+[github](https://github.com/isc-projects/kea).
+
+This is almost as good as sending MR on gitlab. The downside is that Kea devs don't look at github
+too frequently, so it may be a while before we notice it. And when we do, the chances are we will be
+busy with other things. With gitlab, your MR will stare at us the whole time, so we'll get round to
+it much quicker. But we understand that there are some cases where people may prefer github over
+gitlab.
+
+See the excellent documentation on github: https://help.github.com/articles/creating-a-pull-request/
+for details. In essence, you need github account (spam/hassle free, takes one minute to set
+up). Then you can fork the Kea repository, commit changes to your repo and ask us to pull your
+changes into official Kea repository. This has a number of advantages. First, it is made against a
+specific code version, which can be easily checked with git log command. Second, this request pops
+up instantly on our list of open pull requests and will stay there. The third benefit is that the
+pull request mechanism is very flexible. Kea engineers (and other users, too) can comment on it,
+attach links, mention other users etc. You as a submitter can augment the patch by committing extra
+changes to your repository. Those extra commits will appear instantly in the pull request. This is
+really useful during the review. Finally, Kea developers can better assess all open pull requests
+and add labels to them, such as "enhancement", "bug", or "unit-tests missing". This makes our life
+easier. Oh, and your commits will later be shown as yours in github history. If you care for that
+kind of things, once the patch is merged, you'll be automatically listed as contributor and Kea will
+be listed as project you have contributed to.
+
+## If you really can't do MR on gitlab or PR on github...
+
+Well, you are out of luck. There are other ways, but those are really awkward and the chances of
+your patch being ignored are really high. Anyway, here they are:
+
+- [create an issue in the Kea Gitlab](https://gitlab.isc.org/isc-projects/kea/issues/new) and attach
+  your patch to it. Sending a patch has a number of disadvantages. First, if you don't specify the
+  base version against which it was created, one of Kea developers will have to guess that or go
+  through a series of trials and errors to find that out. If the code doesn't compile, the reviewer
+  will not know if the patch is broken or maybe it was applied to incorrect base code. Another
+  frequent problem is that it may be possible that the patch didn't include any new files you have
+  added.  If we happen to have any comments that you as submitter are expected to address (and in
+  the overwhelming majority of cases, we have), you will be asked to send an updated patch. It is
+  not uncommon to see several rounds of such reviews, so this can get very complicated very
+  quickly. Please don't add your issue to any milestone. Kea team has a process of going through
+  issues unassigned to any milestone. Kea developers review new issues once a week and assign them
+  to specific milestones. Please do not add issues to working milestones directly. Having an issue
+  in gitlab ensures that the patch will never be forgotten and it will show up on our gitlab
+  reports. It's not required, but much appreciated if you send a short note to the kea-dev mailing
+  list explaining what you did with the code and announce the issue number.
+
+- Send a patch to the kea-dev list. This is the third preferred method, if you can't or don't want
+  to use gitlab and github. If you send a patch to a mailing list in a wrong time, e.g. shortly
+  before a release, Kea developers may miss it or perhaps they will see it and then forget about
+  it. Nevertheless, it is still doable and we successfully accepted patches that way. It just takes
+  more time from everyone involved, so it's a slower process in general.
+
+- Send a tarball with your modified code. This is really the worst way one can contribute a
+  patch. It has a number of disadvantages. In particular, someone will need to find out which
+  version the code was based on and generate the patch. It's not rocket science, but it may be a
+  very mundane thing to do if the Kea developer does not know the version in advance. The mailing
+  list has a limit on the message size (for good reasons), so you'll likely need to upload it
+  somewhere first. Kea developers often don't pick up new issues instantly, so it may have to wait
+  weeks before the tarball is looked at. The tarball does not benefit from most of the advantages
+  mentioned for github, like the ability to easily update the code, have a meaningful discussion or
+  see what the exact scope of changes are. Nevertheless, if we given a choice of getting a tarball
+  or not getting a patch at all, we prefer tarballs. Just keep in mind that processing a tarball is
+  really cumbersome for Kea developers, so it may take significantly longer than other ways.
+
+## Going through a review
+
+Once you make your patch available using one of the ways above, the action is on one of the Kea
+developers. We need an issue. While we can create it on our own, we prefer the original submitter
+fill them in as he or she has the best understanding of the purpose of the change and may have any
+extra information about OS, version, why it was done this specific way etc. If there is no MR and no
+gitlab issue, you risk the issue not showing up on ISC radars. Depending on the subjective
+importance and urgency as perceived by the ISC engineer, the issue or PR will be assigned to one of
+the milestones.
+
+Sooner or later, one of Kea developers will do the review. Here's the tricky part. One of Kea
+developers will review your patch, but it may not happen immediately. Unfortunately, developers are
+usually working under a tight schedule, so any extra unplanned review work may take a while. Having
+said that, we value external contributions very much and will do whatever we can to review patches
+in a timely manner. Don't get discouraged if your patch is not accepted after first review. To keep
+the code quality high, we use the same review processes for external patches as we do for internal
+code. It may take some cycles of review/updated patch submissions before the code is finally
+accepted. The nature of the review process is that it emphasizes areas that need improvement. If you
+are not used to the review process, you may get the impression that the feedback is negative.  It is
+not: even the Kea developers seldom see reviews that say "All OK please merge".
+
+Once the process is almost complete, the developer will likely ask you how you would like to be
+credited.  The typical answers are by first and last name, by nickname, by company name or
+anonymously. Typically we will add a note to the ChangeLog and also set you as the author of the
+commit applying the patch and update the contributors section in the AUTHORS file. If the
+contributed feature is big or critical for whatever reason, it may also be mentioned in release
+notes.
+
+Sadly, we sometimes see patches that are submitted and then the submitter never responds to our
+comments or requests for an updated patch. Depending on the nature of the patch, we may either fix
+the outstanding issues on our own and get another Kea developer to review them or the issue may end
+up in our Outstanding milestone. When a new release is started, we go through the issues in
+Outstanding, select a small number of them and move them to whatever the current milestone is. Keep
+that in mind if you plan to submit a patch and forget about it. We may accept it eventually, but
+it's much, much faster process if you participate in it.
+
+## Extra steps
+
+If you are interested in knowing the results of more in-depth testing, you are welcome to visit the
+ISC Jenkins page: https://jenkins.isc.org This is a live result page with all tests being run on
+various systems. Besides basic unit-tests, we also have reports from valgrind (memory debugger),
+cppcheck and clang-analyzer (static code analyzers), Lettuce system tests and more. Although it is
+not possible for non ISC employees to run tests on that farm, it is possible that your contributed
+patch will end up there sooner or later. We also have ISC Forge tests running, but currently the
+test results are not publicly available.
diff --git a/COPYING b/COPYING
index cf5d72e..e29c21e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (C) 2009-2018 Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2009-2019 Internet Systems Consortium, Inc. ("ISC")
 
 This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/ChangeLog b/ChangeLog
index db4af4a..a3ddb91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,886 @@
+Kea 1.6.1 released on Nov 20, 2019
+
+1660.	[bug]		tmark
+	Fixed a bug introduced in Kea 1.6.0 (see #539) that caused
+	kea-dhcp4 and kea-dhcp6 to discard inbound packets containing
+	string options that consist solely of nulls.  The servers
+	will now quietly omit empty or all-null string options from
+	inbound packets.
+	(Gitlab #900)
+
+1659.	[bug]*		tmark
+	Added logic to core code and HA hook lib to allow HA peers
+	to detect and handle out of bandwidth socket events.  This
+	corrects a defect introduced in Kea 1.6.0 that can cause
+	an HA server to become unresponsive when an HA socket has
+	been closed by a peer.  Note that there is a change to the
+	signature of the external socket callback handler invoked
+	by IfaceMgr.  Custom hook libraries happen register external
+	sockets with IfaceMgr will require modification and
+	recompilation.
+	(Gitlab #964)
+
+Kea 1.6.0 released on Aug 28, 2019
+
+1658.	[bug]		tmark
+	Renamed the column "array" in option definition tables
+	in MySQL schema to "is_array" to avoid a reserved word
+	conflict introduced by MySQL 8.0.17.
+	(Gitlab #853,!26-p, git 6665c3b6d0f9f2a45b7710e8e9a36fff8f99bf7f)
+
+1657.	[bug]		marcin, tomek
+	Corrected multiple occurrences of out of bounds vector reads.
+	These could cause server to assert when GLIBCXX_ASSERTIONS
+	was enabled during compilation. Also, elminated overflows as
+	a result of strncpy.
+	(Gitlab #851,!24-p, git 4b1d6ffc5ae4f1e1fa5990a644c9786e7f6afea6)
+
+1656.	[bug]		marcin
+	Corrected a bug in the Kea MySQL Configuration Backend which
+	caused the Kea DHCPv6 server to incorrectly require the server
+	tag to be provided with the remote-subnet6-option-set command.
+	In addition, corrected issues with setting and deleting
+	pool specific DHCP options via the Configuration Backend.
+	(Gitlab #847,!23-p, git 578bc6c997679c507c2f9e419783d34de77816cd)
+
+1655.	[bug]		marcin
+	Corrected a bug in the Kea MySQL Configuration Backend which
+	prevented the DHCP servers from discovering and fetching the
+	changes applied with the new commands. The new commands set
+	and delete the options embedded within the subnets, shared
+	networks and pools.
+	(Gitlab #845,!22-p, git 7fb2255b212e4e98ff4dbf6d8e2e0ada78701110)
+
+1654.	[sec]		tmark
+	kea-dhcp4 Memfile logic now ensures during reading and writing
+	that leases which are not in the declined state, have either
+	a hardware address, client id, or both. kea-dhcp6 Memfile logic
+	now ensures leases which are not declined have a non-empty DUID.
+	CVE:2019-6474
+	(Gitlab #805,!6-p, git 9705445210cf2a5c4bbe86fde4ce010c45b7aac1)
+
+1653.	[sec]		tmark
+	Added a new parameter, "max-row-errors", to Memfile lease database
+	configuration for kea-dhcp4 and kea-dhcp6.  This parameter can be
+	used to limit the number of rows discarded due to error during
+	lease file loading after which the server will abandon the effort
+	and exit. The default value of 0 disables the limit.
+	CVE:2019-6474
+	(Gitlab #805,!5-p git af7393c517cea37a7091075e5d0d24793bccf013)
+
+1652.	[sec]		tmark
+	Prevent the DHCP servers from asserting when malformed
+	hostname or FQDN options are received.  Now the servers will
+	drop the DHCP packets containing the malformed options.
+	CVE:2019-6473
+	(Gitlab #730,!2-p git a2a98c421bb400a81218bd28d6a6f62accd31b1f)
+
+1651.	[sec]		tmark
+	Added logic to kea-dhcp6 to catch values for client or
+	server DUIDs that exceed 128 bytes to inbound packet
+	sanity checking.
+	CVE:2019-6472
+	(Gitlab #722,!1-p git bb1a64b8945950f4439121ce4fef566d37c8630c)
+
+1650.	[build]		marcin
+	Bumped up library version numbers for Kea 1.6.0 final release.
+	(Gitlab #841,!490, git 2e88e2554905dd66b9974c9fc513ee7e7b825a46)
+
+1649.	[doc]		sgoldlust
+	API documentation updated and cleaned up.
+	(Gitlab #810,!471, git f1ae84186beb54d45f8455236827108289b0b0d6)
+
+1648.	[func]		fdupont,marcin
+	Client classification information (client-class,
+	require-client-classes) and excluded prefix (excluded-prefix,
+	excluded-prefix-len) may now be specified in the MySQL
+	Configuration Backend.
+	(Gitlab #659,!387, git 1f2cae397b48e2a28a7a7e61f6392691b9d32c13)
+
+1647.	[doc]		marcin
+	Updated "Local and Relayed Traffic in Shared Networks" sections
+	of the Kea ARM. Explained that all subnets within a shared
+	network should have the same subnet selector, i.e. interface
+	name or relay IP address.
+	(Gitlab #496,!483, git 1335e5643cc142c65bfc49c13280e9aaf3eeec21)
+
+1646.	[func]		fdupont
+	YANG models updated to cover the latest parameters:
+	pattern and max-row-errors.
+	(Gitlab #823,!477, git 79d0d45ec0c791560e297ca77fc88842b0a33868)
+
+1645.	[func]		tmark
+	Binary option data may now be specified as a single-quoted
+	text string, within double quotes: "'some text'".  This is
+	handy for binary options that convey text such as urls or
+	file names.
+	(Gitlab #761,!447, git 215d84f00208ac8a2710c28abc3386d6b765ede6)
+
+1644.	[doc]		marcin, fdupont
+	Added a warning about class dependence on built-in classes.
+	(Gitlab #727,!466, git 9977d2927cf9b9cf1cd13de30aa5551ca900165b)
+
+1643.	[build]		godfryd
+	Added an optional --with-site-packages switch to configure
+	script. It allows python package installation in a separate
+	directory (mostly useful on Debian systems when building native
+	packages).
+	(Gitlab #721,#480, git 66332000ff618fbb41656981c7bbf3bb940066fe)
+
+1642.	[doc]		fdupont, marcin
+	User documentation for remote-option{4,6}-* commands.
+	(Gitlab #826,!479, git 9b469ab63a9627e377a219cf8f83033e4e613b11)
+
+1641.	[func]		tmark
+	Added a new Logger output option, 'pattern', which can be
+	used to customize log message content and layout.
+	(Gitlab #665,!460, git 2add51ecf0d91d2a9ac797594c38472190c18460)
+
+1640.	[func]		fdupont
+	Added sub-option expression for client classification and flex-id.
+	Users can access sub-option with option[12].option[34].hex or
+	option[12].option[34].exist
+	(Gitlab #150,!385, git 70bb412f20b706484538680906d6fcfd7ee6da68)
+
+1639.	[func]		fdupont
+	Updated YANG models with the latest changes in kea-dhcp4 and
+	kea-dhcp6.
+	(Gitlab #433,!473, git c46e8da1561e7d0c6c6f481d2e32cc9ae398324c)
+
+1638.	[bug]		franek, razvan
+	Kea statistics improvements: Correct statistic-get{all} commands.
+	(Gitlab #756,!470, git 59fb24794af8a9ca8ee3621bc01dfd507350b2c1)
+
+1637.	[bug]		tmark
+	Corrected an issue in kea-dhcp6 where the server would assign
+	a different lease each time a client with a dynamic host
+	reservation returned via a SOLICIT.
+	(Gitlab #754,!440, git c548d9330e6f626e538343c5e6361457057efdd7)
+
+1636.	[bug]		razvan
+	Http request and response parser now accepts 0 for Content-Length.
+	(Gitlab #708,!423, git 09d75804e050083b502a96c8e77b0e98c735ae3d)
+
+1635.	[doc]		godfryd, tomek
+	Converted API documentation to Sphinx format.
+	(Gitlab #777,!464, git 3ba1a265537330308c313a38b85e84cbe02704ae)
+
+1634.	[func]		franek, razvan
+	Kea statistics improvements: Added commands for set sample age and
+	set sample count.
+	(Gitlab #731,!459, git dde1b96b33ed20dbe2c815f1168e62b66635e39f)
+
+1633.	[bug]		fdupont
+	Added missing YANG Kea test module in distributions.
+	(Gitlab #747,!436, git a800e79c7917acc723cbc71b626adc360e15a8d7)
+
+1632.	[doc]		razvan, tmark
+	Fixed doc examples.
+	(Gitlab #649,!381, git e14b90735ff57be0776270364064952d353d7e3a)
+
+1631.	[bug]		marcin
+	Corrected the bug in mysql_cb hooks library which in some cases
+	caused the pools to be orphaned and left in the database after
+	the subnet has been updated.
+	(Gitlab #632,!438, git ea15b537d62c66e03923b5fdce91db8795f436b4)
+
+1630.	[build]		fdupont
+	Added support for sysrepo 0.7.8 (and libyang 1.0-r3).
+	(Gitlab #742,!430, git 6776a829f90768225ea794145e522560d26fe959)
+
+1629.	[func]		tmark
+	High Availaiblity logging now also emits server and partner system
+	times when reporting clock skew issues.  Prior to this it reported
+	only the skew between the two servers.
+	(Gitlab #174,!414, git 9715ddecb0143d997a57edea564f5c180a7f8577)
+
+1628.	[bug]		fdupont
+	Improved the error message from MySQL CB -set commands when
+	a specified server does not exist.
+	(Gitlab #732,!429, git 82f34e60363eec72a117939a5526bdb1ececb53c)
+
+1627.	[func]		fdupont
+	Added new command server-tag-get to DHCPv4 and DHCPv6 servers.
+	(Gitlab #470,!386, git 3cb43f112662ba3f9d2fc7152dfa1639401b1491)
+
+1626.	[bug]		marcin
+	Automatically delete embedded options as a result of deleting
+	a subnet, pool or shared network from the MySQL Configuration
+	Backend. Prior to this change, the options were unnecessarily
+	left in the database. The database schema version was affected
+	and its version bumped up to 8.2.
+	(Gitlab #680,!426, git 03f0af3900bdd9eaa951b23cc9508f0618d3f1bb)
+
+Kea 1.6.0-beta2 released on July 24, 2019
+
+1625.	[build]		tmark, marcin
+	Bumped up libraries version numbers for Kea 1.6.0 beta2 release.
+	(Gitlab #740,!427, git 359fe51531e802f052bd4172d4e295378155dbd5)
+
+1624.	[doc]		marcin
+	Documented a usage of the server tags with the Kea Configuration
+	Backend in the Kea ARM.
+	(Gitlab #643,!421, git 4c60b02e619bce2c434bbf9ee0e775d8776b2d74)
+
+1623.	[bug]		fdupont
+	Eliminated the issue whereby the DHCP server could terminate as a
+	result of the remote-network4-del and remote-network6-del commands.
+	(Gitlab #738,!425, git b34151b647aae8690fe0996090e13403a8e3ad55)
+
+1622.	[bug]		fdupont
+	Corrected server tags returned with the metadata when fetching
+	option definitions from the MySQL configuration backend
+	(Gitlab #737,!424, git 1cc95ae2a66102427e583b4924383fd414e24f0f)
+
+1621.	[func]		fdupont
+	Both kea-dhcp4 and kea-dhcp6 now support a special class, 'DROP'.
+	When the class is defined, inbound client packets that match the
+	class's match expression will be dropped without further processing.
+	Each such drop is logged at DEBUG level and accounted for in
+	drop statistics.
+	(Gitlab #606,!375, git bfa5b2c50324e9d2339daa8309774f49a5e7bf3c)
+
+1620.	[func]		franek, razvan
+	Kea statistics improvements: Support for storing more than one
+	sample.
+	(Gitlab #696,!418, git c7b8c275758c96f56081e02da429f5dd9d653b87)
+
+1619.	[func]		marcin
+	Add support for associating subnets with the server tags in the
+	mysql_cb hooks library.
+	(Gitlab #717,!417, git e121ec4e0a04bc5bebdbfecf9cc1606b50e71263)
+
+1618.	[func]		marcin
+	Add support for associating the shared networks with the server
+	tags in the mysql_cb hooks library.
+	(Gitlab #716,!412, git 326fdbeb51dc1f6eebbdbbdcce78cfac87a61bd9)
+
+1617.	[bug]		fdupont
+	During the application of the config backend the external config
+	is initialized to the default values so when a global parameter
+	is changed and deleted it gets back a sane value.
+	(Gitlab #630,!355, git 237afd3c512ed4d05ae76de76cce21dca643a889)
+
+1616.	[func]		fdupont
+	Renamed kea-admin lease-init, lease-version and lease-upgrade
+	commands to db-init, db-version and db-upgrade. Only the lease-*
+	command is now lease-dump.
+	(Gitlab #466,!393, git cbd2ed23f2ea0649ccf608fe818197d2923108f0)
+
+1615.	[func]		fdupont
+	Added check for keyword name and type in parsers of objects
+	managed by the config backend (options, option definitions,
+	subnets and shared networks).
+	(Gitlab #575,!358, git c9d87afad8db924da0aadc1b8ab40638bd0a6738)
+
+1614.	[func]		marcin
+	Add support for associating the DHCP option definitions with
+	the server tags in the mysql_cb hooks library.
+	(Gitlab #715,!411, git 5511725555138213de4f48dc1091d65b5db47034)
+
+1613.	[func]		marcin
+	Add support for associating the global DHCP options with the
+	server tags in the mysql_cb hooks library.
+	(Gitlab #714,!409, git 711c1dca9de388b786942fe5bedb8b8cf63b85ba)
+
+1612.	[bug]		razvan
+	Fixed crash caused by unloading premium libraries which use
+	custom host cache containers.
+	(Gitlab #639,!410, git d3f7e9d9a18d93fb014c8e637e15c6ae9ca9269e)
+
+1611.	[doc]		fdupont
+	Clarified how Kea handles subnet prefixes in server configuration.
+	(Gitlab #419,!333, git f260b51148b4f7584165e13fcf2320fdd5992a74)
+
+1610.	[build]		fdupont
+	Removed the obsolete compatcheck top directory.
+	(Gitlab #667,!391, git 8cb113a52f0cf56fbdb5cb0e87464135234c2ac1)
+
+1609.	[bug]		fdupont
+	Fixed the implementation of authentication keys in DHCPv6
+	host reservations. Please note this includes a PostgreSQL
+	schema update.
+	(Gitlab #550,!297, git f45511f0445cd4204671771175f7f0d34df54b0e)
+
+1608.	[bug]		fdupont
+	Missing debug DHCP6_PACKET_SEND logging message was added.
+	(Gitlab #699,!401, git ac96edbe30be5c93f5e3d2512961f1bc99c3253a)
+
+1607.	[bug]		tmark
+	Corrected an initialization issue which caused lease sanity
+	checking to be enabled inside the Lease File Cleanup (LFC)
+	process.  The LFC cannot meaningfully perform sanity checking
+	as it does not have access to the full server configuration.
+	(Gitlab #686,!403 git 68b2cb0385779ef0c520164e418dee124d7cb364)
+
+1606.	[bug]		tmark
+	Corrected an error with retrieving DHCPv6 leases, whose IAID
+	values are larger than int32_t max, from Postgresql lease
+	databases.
+	(Gitlab #651,!384, git 67e047df61d56558d474514a21ed0db96152557a)
+
+1605.	[func]		marcin
+	Extended mysql_cb hooks library to support new API calls for
+	managing the DHCP servers in the database. In addition, added
+	support for associating the global parameters with the server
+	tags.
+	(Gitlab #642,!373, git 8ca1021809a6c44cf8a6589a959e94ca9ca76c29)
+
+1604.	[bug]		fdupont
+	Improved configuration failure messages when the problem is
+	from the configuration backend and not the configuration file.
+	(Gitlab #616,!379, git 637e9f03cc502068822ab0310f2e070d4a4da339)
+
+1603.	[perf]		tmark
+	High Availability now registers its HTTP sockets with Interface
+	Manager's main thread allowing the thread can monitor them for
+	IO readiness. This should improve the responsiveness of HA peers
+	to each other.
+	(Gitlab #691,!395, git 4a0b024bc6d83b26fe702d95ee7ce0c914b37d8e)
+
+1602.	[func]		fdupont
+	Added more information to sanity-checker log messages.
+	(Gitlab #685,!392, git 5367cd1196662739bbff5e99072ab6a55cfb0489)
+
+1601.	[func]		fdupont
+	Kea servers now add the lease validity lifetime to informational
+	lease allocation log messages.
+	(Gitlan #694,!399, git cb29b532cf1f8790f9752d7e8253b0aa31ce05e6)
+
+1600.	[bug]		fdupont
+	Fixed prefixLengthFromRange() routine.
+	(Gitlab #583.!377, git 10bd31217d8a0a77345c4cba7a59314f70c1b509)
+
+1599.	[perf]		marcin
+	Improved performance of the DHCPv6 server running with High
+	Availability by aggregating multiple lease updates in a single
+	lease6-bulk-apply command instead of generating multiple
+	lease6-update commands, one for each allocated lease.
+	(Gitlab #689,!394, git 65021b840b94da3d118e541fba5469c8ed15175b)
+
+1598.	[bug]		razvan
+	Added unittests for long (> 65536 chars) tokens in parsed configs
+	so any crash related to parsers could be detected.
+	(Gitlab #604,!376, git 811735b67fcdb5592c3e020792c154f2f454259c)
+
+1597.	[func]		fdupont
+	Added new configuration parameters for handling user lease
+	time hints to kea-dhcp4: min-valid-lifetime and max-valid-lifetime;
+	and to kea-dhcp6: min-preferred-lifetime, max-preferred-lifetime,
+	min-valid-lifetime, and max-valid-lifetime.
+	(Gitlab #295,!325, git 8641448c4106bf28ea32df72e5e0ad520d3946ae)
+
+1596.	[func]		marcin
+	Implemented lease6-bulk-apply command in the lease_cmds hooks
+	library.
+	(Gitlab #683,!390, git 122473c18b632ddfa22b8a48f6d9399bc18e2598)
+
+1595.	[func]		fdupont
+	Removed unused t1_ and t2_ members from internal lease class.
+	(Gitlab #567,!357, git 6072db5f4ca6cfa9573152c255f97dd170acbd57)
+
+1594.	[bug]		fdupont
+	Kea no longer uses the .../var/kea directory, for instance pid
+	files are now in .../var/run/kea.
+	BEWARE this applies to the kea-dhcp6-serverid file so if the
+	server will not find the file at its new location it will believe
+	it is the first time it is being started and will generate a new
+	server DUID.  If that happens, clients will keep trying to get to
+	the old server and be confused.
+	(Gitlab #538,!334, git 928b9ae57452aae1dff92ad689ba180fa975381c)
+
+1593.	[bug]		marcin
+	Fixed a bug in the Kea Control Agent which caused a sporadic crash
+	after a tiemout while sending the HTTP response to the controlling
+	client.
+	(Gitlab #491,!363, git ff204dfe4dd80702f8bb2edf83f8486e019a7e04)
+
+1592.	[build]		tmark
+	Files related to YANG and netconf are now only installed
+	when the build is configured with --with-syspro.
+	(Gitlab #584,!364, git 350ae513ed4e8e8e07b159658f88ec7d70b644d3)
+
+1591.	[doc]		razvan
+	Fixed classify and pd-exclude documentation examples.
+	(Gitlab #590,!380, git 26b04d2d2d2a88be6abc5879a2fb48e05f0003fd)
+
+1590.	[func]		fdupont
+	It is now possible to specify hostname-char-set and
+	hostname-char-replacement at the global scope allowing to sanitize
+	host names without requiring a dhcp-ddns entry.
+	(Gitlab #540,!374, git 0a5979369902070ee0c4faf3b713627455b99489)
+
+1589.	[bug]		razvan
+	Fixed configuring kea with tools/cql_config when using --with-cql
+	from source.
+	(Gitlab #522,!261, git bf7debc182e094a8b34f1f2df99cf4e9f84c8906)
+
+1588.	[func]		marcin
+	Extended APIs of the DHCPv4 and DHCPv6 configuration backends with
+	the management functions for the server tags.
+	(Gitlab #641,!352, git 022d2266e71ced7ec79e0717298ca8e88330a7e7)
+
+1587.	[bug]		razvan
+	Fixed IPv6 prefix delegation pools retrieval from the MySQL
+	Configuration Backend.
+	(Gitlab #637,!349, git 483273734e8608ed68624d7a868f20672c859c95)
+
+Kea 1.6.0-beta released on May 29, 2019
+
+1586.	[build]		razvan, marcin
+	Bumped up libraries version numbers for Kea 1.6.0 beta release.
+	(Gitlab #617,!340, git c0434bf882b6ec483120e39f6b70b5a40fe7c711)
+
+1585.	[bug, func]	marcin
+	MySQL Configuration Backend supports DHCPv6 interface-id parameter.
+	(Gitlab #628,!341, git 3a07c636ba4c7fceabe59ec597c44a9c8e3367eb)
+
+1584.	[doc]		marcin
+	Documented Kea Configuration Backend in the Kea Administrator
+	Reference Manual.
+	(Gitlab #71,!314, git 3a65b7a9104f2a988dacf1acc26312b4259e958d)
+
+1583.	[bug]		fdupont, marcin
+	Corrected a bug which caused failures to merge a subnet from the
+	Configuration Backend into the DHCP server's configuration
+	when subnet identifier was modified.
+	(Gitlab #492,!252, git c9aba2b5e915c27a8539e6b8f0498179ba896da4)
+
+1582.	[bug]		tmark
+	Input values for DHCPv4 and DHCPv6 options of type 'string'
+	will now be trimmed of any trailing null bytes (0x0).
+	(Gitlab #539, !330, git b126558e9e39e9bff517dceac25a00e96d150085)
+
+
+1581.	[bug]		marcin
+	Corrected a bug whereby the DHCPv6 server did not take into
+	account a relay address specified at the shared network level
+	during the subnet selection.
+	(Gitlab #620,!332, git c2383e404a5227f6b55655c09ccdc03930815500)
+
+1580.	[bug]		jonatan.raudsepp
+	Compilation fix for Alpine linux in Perfdhcp code. Thanks to
+	Jonatan Raudsepp for sending a patch!
+	(Gitlab #624,!337, git 19321df9e4490b75ac7b322afec9d231bcb6ffe3)
+
+1579.	[bug]		razvan
+	Fixed a bug which caused setting dhcp4o6-port to not function via
+	Kea configuration backend.
+	(Gitlab #577,!331, git 98c24fe1873795bbc94d426c54c588b05d79406f)
+
+1578.	[func]		fdupont
+	The configuration syntax has changed. The Logging scope that used
+	to be shared between all servers has been deprecated. Each daemon
+	is supposed to define its own loggers using 'loggers' array. The
+	old configuration syntax is still accepted, but is considered
+	deprecated.  Kea 1.6 will accept it, but that capability will be
+	removed in the future. Please migrate your configuration to new
+	syntax.
+	(Gitlab #208,!196, git 37b8ec6c2c4b64681059f8fad26d112adbb7ee2b)
+
+1577.	[func]		razvan
+	Implemented host reservations page retrieval for Cassandra.
+	(Gitlab #511,!278, git 152e82b49f5e5abd9d3a2a4825ed8620973f5ef1)
+
+1576.	[doc]		fdupont
+	New commands cache-get-by-id and cache-size are now documented.
+	(Gitlab #594,!324, git 3753008cc77f71457b5d777560d8e36dc56e7acd)
+
+1575.	[bug]		razvan
+	Fixed issue with keactrl logging error when trying to stop running
+	services.
+	(Gitlab #534,!327, git 6ddee0a93ec4ad692cc385150c159d9e8da5232d)
+
+1574.	[bug]		razvan
+	Add logging to the MySQL config backend.
+	(Gitlab #398,!315, git bc46fd3420afdf60ae8841866e8458f7f6e072e8)
+
+1573.	[bug]		razvan
+	Fixed build sysrepo from sources using sysrepo_config.
+	(Gitlab #523,!262, git b86864a9b058a18eaaded2273dc5f40a9ec97c78)
+
+1572.	[bug]		tmark
+	Corrected an issue where kea-dhcp6 was incorrectly scheduling DNS
+	entry removals when renewing leases with generated FQDNs.
+	(Gitlab #577,!310, git 362f40bebbdbe083ec6420a43ee1c050edf6bba6)
+
+1571.	[bug]		marcin
+	The mysql_cb hooks library registers the MySQL backend for the
+	DHCPv6 server.
+	(Gitlab #603,!322, git 1ede298fcdc7a9b7018b6e300e2d759e33f73645)
+
+1570.	[bug]		marcin
+	Corrected the bug in the Kea HTTP library which could cause a server
+	to assert when system clock was modified during the transaction.
+	(Gitlab #599,!320, git 958abe5063b6e602c0070e336524e313c3a87671)
+
+1569.	[perf]		fdupont
+	Improved performance of the DHCPv4 server in cases when
+	match-client-id set disabled by removing unnecessary query to the
+	lease database."
+	(Gitlab 509,!272, git 2ad41651c1118fe6f7dfb918df0694dd254706f1)
+
+1568.	[bug]		tmark
+	kea-dhcp6 now properly skips sanity checking prefix leases.
+	Prior to this it was incorrectly subjecting them to sanity
+	checks during memfile lease file reloads and then flagging
+	the leases as incorrect.
+	(Gitlab #591,!#313, git 12262c5df19673652be73cf1dd62d07527bee95d)
+
+1567.	[bug]		marcin
+	Kea HTTP client now always includes Host header in all HTTP requests.
+	The Host header is required in all HTTP/1.1 requests. This corrects
+	the problem whereby HA peers were unable to communicate via reverse
+	HTTP proxy because the proxy was responding with Bad Request status
+	when no Host header was included.
+	(Gitlab #360,!305, git ddb6dbf4cf63e98d3954c5d46e0311abc4fd6cfc)
+
+1566.	[func]		tmark
+	kea-dhcp6 can now be configured to calculate values to
+	send to clients for T1 and T2 times. Prior to this
+	it was only possibly to specify explicit values.
+	(Gitlab #365,!296, git 144b83a84c836d6ff17620b35cb74f830b13c2eb)
+
+1565.	[func]		marcin
+	MySQL Config Backend returns server tags associated with the
+	configuration elements.
+	(Gitlab #579,!309, git 1e2648df047fe964e8ad3e9deb1c85eea32b1219)
+
+1564.	[func]		fdupont
+	Implemented two new commands to manage subnets:	subnet4-update and
+	subnet6-update. They allow an update of existing subnets
+	configuration.
+	(Gitlab #465,!265, git 71eb9188033f81dab56fc5a847a39f5497398b62)
+
+1563.	[bug]		razvan
+	Fixed compilation of google benchmarks.
+	(Gitlab #520,!260, git 11aa890d30ecce5518b9f0bad389feea6be78167)
+
+1562.	[bug]		marcin
+	Corrected a bug whereby the DHCP server would trigger a segfault
+	upon termination when MySQL configuration backend was in use.
+	(Gitlab #571,!306, git 705e7bb6dd27ec90dd2807d4aac0905e3cb13de4)
+
+1561.	[func]		tmark
+	kea-dhcp6 now automatically deletes configuration elements
+	that have been deleted from configuration backends.
+	(Gitlab #566,!304, git 2e85376f1b57187b822c662144380e04372cffff)
+
+1560.	[bug]		fdupont
+	kea-dhcp4 now permits option code values of 0 and 255 for
+	options defined in option spaces other than the "dhcp4" space.
+	(Gitlab #564,!300, git 7a0a0b84d91893f08c0ee6f236daa05bede65166)
+
+1559.	[func]		fdupont
+	Added DHCPv6 support to the MySQL Config Backend hook.
+	(Gitlab #397,!244, git 980091ecd717e41a61f0d7f6808213e450647d8e)
+
+1558.	[func]		tmark
+	In addition to a continuous string of digits, hexadecimal
+	literals may now be a series of one or more octets separated
+	by either colons or spaces.
+	(Gitlab #484, git 251efcd5f518a215173845b22555276df0e0ffc6)
+
+1557.	[bug]		marcin
+	Added support for "reservation-mode" parameter in the shared network
+	configuration parsers. It corrects a bug in Configuration Backend
+	whereby host reservation mode was not stored in the database when
+	specified via remote-network4-set command.
+	(Gitlab #517,!301, git e6533001e9d850432254d3cfe995a4f7abcee6e2)
+
+1556.	[bug]		fdupont
+	Corrected parser for option definitions to refuse definitions with
+	duplicate code or name.
+	(Gitlab #503,!246, git 0befb653277463cd8f88740119fe90a93dbb1466)
+
+1555.	[bug]		fdupont
+	Corrected parsers for option definitions to prevent setting out of
+	range option code values.
+	(Gitlab #500,!247, git 5c139602d7656df74060fee63461ffba4f290547)
+
+1554.	[func]		tmark
+	kea-dhcp6 now uses globals, option definitions, options,
+	share-networks, and subnets from configuration back ends.
+	(Gitlab #413,!288, git ff367e273ed8763b354db272c5955a78203d865e)
+
+1553.	[func]		marcin
+	DHCPv4 server automatically fetches incremental configuration updates
+	from the configuration backends.
+	(Gitlab #103,!277, git 319f7709edb40d6c01390a34942b9d4a200b333e)
+	(Gitlab #103,!289, git 80087e2d0f90f9ba6623860fed4f4d33ee935ad0)
+
+1552.	[bug]		marcin
+	Corrected inheritance of the subnet and shared network specific
+	parameters in the MySQL Configuration Backend.
+	(Gitlab #552,!295, git 4812e4227a57b29bfa3995e71588233424a3abb1)
+
+1551.	[func]		razvan
+	Added consistency and serial-consistency parameters to CQL
+	connection. Fixed all statements.
+	(Gitlab #16,!287, git 56a9b6a860899274f9cafe2366a6731a46490e92)
+
+1550.	[func]		marcin
+	Implemented inheritance of the DHCPv4 global and shared network
+	specific configuration parameters when using configuration
+	backend.
+	(Gitlab #490,!284, git 2508f942e879ef74b20c07ffdba37d187d6ea932)
+
+1549.	[func]		tmark
+	kea-dhcp6 can now be configured to fetch data from configuration
+	back ends. It does not yet utilize the data fetched.
+	(Gitlab #104,!290, git d8a25c1ecd17ad24bdce6af19e7a42ce66d4c4f2)
+
+1548.	[func]		razvan
+	Added consistency and serial-consistency parameters to CQL
+	connection.
+	(Gitlab #16,!266, git 5771173d721464d879869fad6456211031858d6c)
+
+1547.	[bug, doc]		fdupont
+	Option value for sip-ua-cs-domains has been corrected in the
+	Kea User's Guide. Thanks to Shawn Routhier from Infoblox for
+	reporting this issue.
+	(Gitlab #536,!281, git c128fd9a6b7bffc36ba4fe9a0badebe55441d673)
+
+1546.	[func]		tmark
+	kea-dhcp4 now uses options fetched from configured backends.
+	(Gitlab #401,!254, git 6a33a6f1810f5899ff9c8bc79d0093eebad5c728)
+
+1545.	[func]		fdupont
+	A new parameter "data-directory" has been added to DHCPv6.
+	If specified, it allows DHCPv6 server to store lease and
+	server-id files in non-standard locations.
+	(Gitlab #430,!263, git 1f094e18a21124abcaf846cab52c8cba65ca36bc)
+
+1544.	[build]		fdupont
+	Message compiler is no longer needed during compilation and
+	generated message files are part of the distribution. They can be
+	regenerated using --enable-generate-messages switch passed to
+	configure script.
+	(Gitlab #441,!233, git 499b7c36454bcac2553f7bf304d48d7d80f4d4ca)
+
+1543.	[bug]		fdupont
+	Corrected behavior of the remote-subnet4-set so as it is now
+	possible to set the subnet using both an ID or a subnet prefix.
+	(Gitlab #481,!251, git 9ef651950fde16e258e4b03dd21bbf6dd07d5231)
+
+1542.	[test]		tmark
+	MySQL, PostgreSQL, and CQL unit tests will now attempt to wipe
+	the unit test data, rather than the (re)create the schema between
+	each test.  This reduces test execution time appreciably.  The
+	behavior may be overridden by defining environment variable:
+	KEA_TEST_DB_WIPE_DATA_ONLY="false".  This will cause the schema
+	to be recreated before each test but may dramatically increase
+	test execution time.
+	(Gitlab #526,!269, git 7e81d7bea27e919b652351880872aae68ad1b209)
+	(Gitlab #531,!279, git 7f8c4fc535df3019789aea1881b7bb3bd539963a)
+
+1541.	[bug]		fdupont
+	Empty Relay Agent Information option is no longer sent in server
+	responses. Thanks to Geoffrey Huang from Qingdao Agricultural
+	University, and Jiaqi Liu from Qingdao WuKeSong Company
+	Communication Limited, Shandong, PRC for reporting this issue.
+	(Gitlab #519,#510,!271, git f3563396d2227e48e96a5d65587406d8d1868db5)
+
+1540.	[func]		fdupont
+	Added a new method deleteSharedNetworkSubnets4 in the config
+	backend API to delete all subnets belonging to a shared network.
+	(Gitlab #512,!256, git 76991c42d115641c7fdcd0f215137be578fb39a0)
+
+1539.	[build]		fdupont
+	Obsolete dns++.pc file for pkg-config was removed.
+	(Gitlab #498,!274, git 93cd62c99f69cc379c08cd06791db522c1fb0aca)
+
+1538.	[func]		marcin
+	DHCP configuration parsers correctly handle unspecified parameters.
+	This change was required for the MySQL Config Backend to record
+	unspecified parameters as NULL in the database.
+	(Gitlab #488,!259, git d3b33058651036be34200f16d2da230267415056)
+
+1537.	[func]		godfryd
+	Improved handling unix sockets in unit tests. Now by default
+	they are created in temporary folder under /tmp folder. This
+	fixes the issue with creating sockets with too long path
+	in the case when source folder is deeply nested.
+	(Gitlab #357,!258, git a45e2f68d7d1848adb0cf755954a3d76c9dff338)
+
+1536.	[build]		tomek
+	Many changes in keactrl, kea-admin, cql_config and sysrepo_config
+	scripts. ISC is now using shellcheck to verify portability of
+	our scripts.
+	(Gitlab #480,!245, git 8818ba0260ba36710b88db6401069f9fe4f3a73a)
+
+1535.	[func]		godfryd
+	Added checking required Vagrant version by Hammer.
+	Removed Hammer from EXTRA_DIST.
+	(Gitlab #518,!257, git ea0006f6eb948d7d4a034b413c5086cbe483eb75)
+
+1534.	[func]		marcin
+	MySQL config backend correctly handles the optional values for
+	subnets and shared networks. Also, updated the MySQL config
+	backend to store and fetch T1 and T2 percentage settings.
+	(Gitlab #489,!250, git 01fc4d5bb4105b90c7025e8ca8131c3c15203848)
+
+1533.	[doc]		sgoldlust,stephen
+	Kea User's Guide significantly updated.
+	(Gitlab #362,!182, git 4b7a8df6054d18f2c90fe61d93533466f89e6324)
+
+1532.	[func]*		marcin
+	Renamed OptionalValue C++ object to Optional and modified its
+	API. This object is now used to represent optional values in
+	subnets and shared networks. This is an internal Kea logic
+	change but it may impact existing user hooks libraries.
+	(Gitlab #487,!232, git 1c58e0ce9b9fd6fc8864dbfb2335bc5841c78ff3)
+
+1531.	[func]		tmark
+	When fetching configuration data from configured backends,
+	kea-dhcp4 will now merge option definitions.
+	(Gitlab #400,!243, git 0c5d1417031e49bd0c247889989e187db2dd8f4b)
+
+1530.	[bug]		adwol
+	Potential syntax error in keactrl fixed. Thanks to Adam Osuchowski
+	from Silesian University of Technology for providing a patch.
+	(Gitlab #162,!241, git b1a1137f252432aa956ed6fea3da21c740857333)
+
+1529.	[func]		tmark
+	When fetching configuration data from configured backends,
+	kea-dhcp4 will now merge global parameters.
+	(Gitlab #402,!224, git dadaf76f8dd61b8bb3405aa5dc80029f09b2d4ec)
+
+1528.	[func]		fdupont
+	Aligned DHCPv4 and DHCPv6 specific tables used by the MySQL Config
+	Backend. Extended MySQL schema to implement audit trail for the
+	DHCPv6 Config Backend.
+	(Gitlab #460,!232,!236, git 57f945f917db522773281c9e95ec8027afae6205)
+
+1527.	[build]		adwol,fdupont,tomek
+	Default Kea installation directory has been changed to
+	${prefix}/lib/kea/hooks.
+	(Gitlab #161,!240, git cfaf16cf02191bf5b7172cade3f58a626288b5f0)
+
+1526.	[func]		tmark
+	In addition to subnets, when fetching configuration data from
+	configured backends, kea-dhcp4 will now merge shared-networks.
+	(Gitlab #399,!215, git 6b57b6b5d678c91b6b380fbe08beafd06b0e7b1d)
+
+1525.	[func]		fdupont
+	Defined API for the DHCPv6 Configuration Backend.
+	(Gitlab #458,!231, git f16e03d9bf1c10903c16b2614223b10880f73d50)
+
+1524.	[func]		tomek
+	Support for vendor options improved in DHCPv4 and DHCPv6. Kea is now
+	able to send back vendor suboptions, even if the client packet didn't
+	include DHCPv4 vivso (125) or DHCPv6 vendor (17) option. Usage of client
+	classification in such a case is required, though.
+	(Gitlab #464,!238, git 5c79da9358862657a631a9a8fc2ce79ae26b762e)
+
+1523.	[bug]		fdupont
+	IfaceMgr::send method now returns proper status that matches
+	its documentation. Thanks to Matthias Stoeckl from Secunet
+	for reporting this issue.
+	(Gitlab #417,!221, git 4be58523f38097cea81ea06161aead58e00aeb2a)
+
+1522.	[bug]		marcin
+	The "unspecified" DHCP timer values (e.g. renew-timer) are
+	represented as NULL values in the database. This corrects
+	a bug whereby the unspecified timers defaulted to 0 which
+	prevented the DHCP server from calculating the timers to
+	be sent to the client. Instead a value of 0 was sent.
+	(Gitlab #451,!227, git 5ec9a55528fbcfff4e0c808f9a745b9fd3a5dfae)
+
+1521.	[func]		marcin
+	Removed subsecond precision for the timestamps in MySQL config
+	backend. It caused issues on systems with MySQL version prior
+	to 5.6.4 which don't support subsecond timestamp values.
+	(Gitlab #444,!229, git 71200e98f5a862908240a0d2e269b5da23290af9)
+
+1520.	[build]		fdupont
+	Made perfdhcp build optional and off by default: to build it
+	please use the new --enable-perfdhcp configure flag.
+	(Gitlab #340,!220, git b2d9a5559c348e82d6730809ccf1429097a9872c)
+
+1519.	[bug]		Brent Bloxam
+	A bug in kea-admin that always assumed the PostgreSQL database is
+	always local has been fixed. Thank you to Brent Bloxam from
+	Beanfield Metroconnect for submiting a patch!
+	(Gitlab #423,!216, git d14e2f34c7d544aeb5e1e219f305fac9ab18c498)
+
+1518.	[func]		marcin
+	Extended MySQL schema to include the types of the global DHCP
+	parameters in the database. The Kea servers will use this
+	information to cast the values fetched from the database into
+	their actual types. The supported types are: string, integer,
+	boolean and real.
+	(Gitlab #429,!217, git edd745c507ce5a888461df1489311de0c22cd312)
+
+1517.	[func]		tmark
+	kea-dhcp4 will now connect to and fetch configuration data from
+	configured backends. At this point, only fetched subnet data is
+	merged and used.
+	(Gitlab #101,!202, git c572f8aea94349ff5fb4afee13a88ba811cc6459)
+
+1516.	[func]		marcin
+	Implemented audit trail for MySQL Configuration Backend. It allows
+	for tracking incremental changes in the servers' configurations.
+	Both mysql_cb hooks library and the MySQL schema have been updated
+	to facilitate this feature.
+	(Gitlab #396,!205, git 6d40db07ef641eef29405c42e718979e7a1e8675)
+
+1515.	[func]		fdupont
+	Changes required for new host commands that retrieve all host
+	reservations from a given subnet (reservation-get-all,
+	reservation-get-page) added. Also added documentation.
+	(Gitlab #313,!199, git 991b2fadcb9e8171a78e27f95e4bfba6393d7824)
+
+1514.	[func]		fdupont
+	Control Agent and DHCP-DDNS daemons now support config-reload
+	command, that instruct a given server to load again its
+	configuration from a file on disk.
+	(Gitlab #375,!192, git 93648a3a4918225e2c4413ae220fccc59eaea99a)
+
+1513.	[func]		godfryd
+	Fixed perfdhcp that now it keeps requested rate during performance
+	testing. Previously it was always about 20% lower than expected.
+	(Gitlab #283,!135, git 329f54bb151ec35888e9a8070cc5fa368d6f1f5e)
+
+1512.   [func]      tmark
+	kea-dhcp4 will now ignore empty Host Name (option code 12) values
+	received from clients.  While an empty value for this option is
+	not RFC-compliant, some clients do send them.  Prior to the this
+	server would drop the entire packet.  In the spirit of being liberal
+	in what we accept, the server will now simply omit the option.
+	(Gitlab #40,!203, git f41bd35c3e7a3bdc1f31c5602fd91d5c84c60163)
+
+1511.	[func]		fdupont
+	Obsolete experimental secure DHCPv6 options (701-704) removed.
+	(Gitlab #386,!196, git 1114527652615fb730e323946cafaf1c7ca72b42)
+
+1510.	[bug]		fdupont
+	DHCPv4 and DHCPv6 no longer crash if badly broken configuration
+	is received.
+	(Gitlab #381,!193, git f45fe7b7e3916d36d017b4ec5b50588fbf517d86)
+
+1509.	[func]		tmark
+	kea-dhcp4 can now be configured to calculate values to
+	send to clients for for T1 and T2 (options 58 and 59
+	repsectively).  Prior to this it was only possibly to
+	specify explicit values.
+	(Gitlab #365,!194, git 67944844a40436cd69e0e5b4962f5c9cba89ef6f)
+
+1508.	[func]		fdupont
+	Implemented the management API using a control socket for the
+	DHCP DDNS (D2) server. D2 now supports the following commands:
+	build-report, config-get, config-set, config-test, config-write,
+	list-commands, shutdown and version-get. Also, extended Control
+	Agent (CA) to support one additional command: config-set.
+	(Gitlab #30,!183, git ab27550cec365f42289eb5fa1bc39f33f01b19c2)
+
+1507.	[func]		tmark
+	kea-dhcp4 now ensures that the message type option (53) is
+	the first option in outbound DHCPv4 packets.  This was done
+	to accommodate non-compliant clients that require the option
+	to be first.
+	(Gitlab #363,!177, git 34f40035bf7a7849083138cacee440a9f0991d67)
+
 Kea 1.5.0 released on Dec 14, 2018
 
 1506.	[build]		marcin
@@ -31,7 +914,7 @@ Kea 1.5.0 released on Dec 14, 2018
 	start using it.
 	(Gitlab #186,!163, git 8f7d556456891e7c675082f7e6cc88da71a92fee)
 
-1500	[func, doc]	tmark
+1500.	[func, doc]	tmark
 	Streamlined the isc::dhcp::PacketQueue interface and
 	added a section on Congestion Handling to the developer's guide.
 	(Gitlab #278,!162, git 0ce615f5da993ac90f675c5315ba7cb5c2ef3e1c)
@@ -453,10 +1336,10 @@ Kea 1.5.0-beta1 released on Nov 9, 2018
 	in lease_cmds hooks library.
 	(Trac #5651, git b056828212f7b206ff8bd07c097fd6f427d22d71)
 
-1430.	[func] 		fdupont
+1430.	[func]		fdupont
 	Lease objects and lease backends are now able to store user
-        context. User context can store an arbitrary data as long
-        as it is in JSON format. Database schemas updated.
+	context. User context can store an arbitrary data as long
+	as it is in JSON format. Database schemas updated.
 	(Trac #5584, git b0b7a198b99fd417466708c80cb7cc2162ae480c)
 
 1429.	[bug]		marcin
@@ -806,7 +1689,7 @@ Kea 1.4.0-beta released on May 18, 2018
 	hosts, ability to store fixed DHCPv4 fields (next-server,
 	server-hostname, boot-file-name) and user contexts in host
 	reservations. Also, the ability to store MAC address details
-        in DHCPv6 leases on PostgreSQL has been improved.
+	in DHCPv6 leases on PostgreSQL has been improved.
 	(Github #70, git 8cd0c1ae416be88baf69c2243e83a429d6d5c965)
 	(Trac #5506, git 8cd0c1ae416be88baf69c2243e83a429d6d5c965)
 	(Trac #5507, git 8cd0c1ae416be88baf69c2243e83a429d6d5c965)
@@ -927,7 +1810,7 @@ Kea 1.4.0-beta released on May 18, 2018
 1355.	[func]		tomek
 	Lightweight 4over6 options reinstantiated. Definitions for DHCPv6
 	options 89 through 96 were added back. DHCPv4 v4 Parameters Option
-        159 has its definition tweaked slightly.
+	159 has its definition tweaked slightly.
 	(Trac #5514, git 6a4aac2b3bfffe41460db6d1cd3c55b1430aa50c)
 
 1354.	[build]		andrei
@@ -1717,7 +2600,7 @@ Kea 1.2.0-beta released on April 7, 2017
 1219.   [func]		marcin
 	Control Agent uses libkea-http to process commands over
 	the RESTful interface.
-        (Trac #5107, git 88ce715926a46b6b3832630116fc7782adc46c7b)
+	(Trac #5107, git 88ce715926a46b6b3832630116fc7782adc46c7b)
 
 1218.	[func]		tmark, tomek
 	Configuration parsing for D2 has been migrated to bison/flex
@@ -1860,7 +2743,7 @@ Kea 1.2.0-beta released on April 7, 2017
 	instances of the deprecated std::auto_ptr with std::unique_ptr.
 	(Trac #5066, git a060d4a983860bf3056d50d9bf7ee4355c8372f2)
 
-1194.   [build]     	marcin
+1194.   [build]		marcin
 	Moved StateModel class from D2 to libkea-util.
 	(Trac #3175, git 270ec379aec2894104a299cdd1080e24007e25fb)
 
@@ -5599,7 +6482,7 @@ bind10-1.1.0beta1 released on April 4, 2013
 	http://bind10.isc.org/wiki/StatisticsItems. Qtype counters are
 	dropped as it requires further spec design discussion.
 	(Trac #2154, Trac #2155,
-	             git 61d7c3959eb991b22bc1c0ef8f4ecb96b65d9325)
+		     git 61d7c3959eb991b22bc1c0ef8f4ecb96b65d9325)
 	(Trac #2157, git e653adac032f871cbd66cd500c37407a56d14589)
 
 bind10-1.0.0-rc released on February 14, 2013
@@ -6154,7 +7037,7 @@ bind10-devel-20121115 released on November 15, 2012
 	to the BIND 10 guide.
 	(Trac #2305, git c4b0294b5bf4a9d32fb18ab62ca572f492788d72)
 
-506.	[security]		jinmei
+506.	[sec]		jinmei
 	Fixed a use-after-free case in handling DNAME record with the
 	in-memory data source.  This could lead to a crash of b10-auth
 	if it serves a zone containing a DNAME RR from the in-memory
@@ -7814,7 +8697,7 @@ bind10-devel-20110819 released on August 19, 2011
 	if and only if the request is signed with a TSIG of a key name
 	"key.example":
 	> config set Xfrout/query_acl[0] {"action": "ACCEPT", \
-	                                  "key": "key.example"}
+					  "key": "key.example"}
 	(Trac #1104, git 9b2e89cabb6191db86f88ee717f7abc4171fa979)
 
 274.	[bug]		naokikambe
@@ -7866,12 +8749,12 @@ bind10-devel-20110705 released on July 05, 2011
 	(Trac #990, git 4a590df96a1b1d373e87f1f56edaceccb95f267d)
 
 266.	[func]		Multiple developers
-        Convert various error messages, debugging and other output
-        to the new logging interface, including for b10-resolver,
-        the resolver library, the CC library, b10-auth, b10-cfgmgr,
-        b10-xfrin, and b10-xfrout. This includes a lot of new
-        documentation describing the new log messages.
-        (Trac #738, #739, #742, #746, #759, #761, #762)
+	Convert various error messages, debugging and other output
+	to the new logging interface, including for b10-resolver,
+	the resolver library, the CC library, b10-auth, b10-cfgmgr,
+	b10-xfrin, and b10-xfrout. This includes a lot of new
+	documentation describing the new log messages.
+	(Trac #738, #739, #742, #746, #759, #761, #762)
 
 265.	[func]*		jinmei
 	b10-resolver: Introduced ACL on incoming queries.  By default the
@@ -8603,7 +9486,7 @@ bind10-devel-20110120 released on January 20, 2011
 	2nd argument of type bool (true or false). This flag, if
 	set, will cause the message to be printed whether or not
 	-v is chosen.
-        (Trac #432, git 880220478c3e8702d56d761b1e0b21b77d08ee5a)
+	(Trac #432, git 880220478c3e8702d56d761b1e0b21b77d08ee5a)
 
 150.	[bug]		jelte
 	b10-cfgmgr: No longer save the configuration on exit. Configuration
@@ -8616,7 +9499,7 @@ bind10-devel-20110120 released on January 20, 2011
 	bindctl: Check if the user session has disappeared (either by a
 	timeout or by a server restart), and reauthenticate if so. This
 	fixes the 'cmdctl not running' problem.
-        (Trac #431, git b929be82fec5f92e115d8985552f84b4fdd385b9)
+	(Trac #431, git b929be82fec5f92e115d8985552f84b4fdd385b9)
 
 148.	[func]		jelte
 	bindctl: Command results are now pretty-printed (i.e. printed in
@@ -9315,9 +10198,9 @@ bind10-devel-20100602 released on June 2, 2010
 
 32.	[func]*		each
 	bin/auth: removed custom query-processing code, changed
-        boost::asio code to use plain asio instead, and added asio
-        headers to the source tree.  This allows building without
-        using an external boost library. (Trac #163, svn r1983)
+	boost::asio code to use plain asio instead, and added asio
+	headers to the source tree.  This allows building without
+	using an external boost library. (Trac #163, svn r1983)
 
 31.	[func]		jinmei
 	lib/dns: added a separate signature for Name::split() as a
@@ -9439,24 +10322,25 @@ bind10-devel-20100421 released on April 21, 2010
 bind10-devel-20100319 released on March 19, 2010
 
 For complete code revision history, see
-	http://git.bind10.isc.org/cgi-bin/cgit.cgi/bind10
+	http://gitlab.isc.org/isc-projects/kea
 Specific git changesets can be accessed at:
-	http://git.bind10.isc.org/cgi-bin/cgit.cgi/bind10/commit/?id=rrr
+	http://gitlab.isc.org/isc-projects/kea/commit/rrr
 or after cloning the original git repository by executing:
 	% git diff rrrr^ rrrr
-Subversion changesets are not accessible any more.  The subversion
-revision numbers will be replaced with corresponding git revisions.
-Trac tickets can be accessed at: https://bind10.isc.org/ticket/nnn
+Prior to gitlab, we used Trac for bug tickets. Those tickets
+can be accessed at: http://oldkea.isc.org/ticket/nnnn
 
 LEGEND
-[bug] general bug fix.  This is generally a backward compatible change,
+[bug]   General bug fix.  This is generally a backward compatible change,
 	unless it's deemed to be impossible or very hard to keep
 	compatibility to fix the bug.
-[build] compilation and installation infrastructure change.
-[doc] update to documentation. This shouldn't change run time behavior.
-[func] new feature.  In some cases this may be a backward incompatible
+[build] Compilation and installation infrastructure change.
+[doc]   Update to documentation. This shouldn't change run time behavior.
+[func]  new feature.  In some cases this may be a backward incompatible
 	change, which would require a bump of major version.
-[security] security hole fix. This is no different than a general bug
+[sec]   Security hole fix. This is no different than a general bug
 	fix except that it will be handled as confidential and will cause
 	security patch releases.
+[perf]  Performance related change.
+
 *: Backward incompatible or operational change.
diff --git a/INSTALL b/INSTALL
index 1f4bdaa..a9b1f77 100644
--- a/INSTALL
+++ b/INSTALL
@@ -34,9 +34,10 @@ Kea depends on C++ compiler, make, libtool, boost (at least includes, but many
 OSes require boost-system library), log4cplus and one crypto library (either
 OpenSSL or Botan) for compilation.  Optional backends (MySQL, PostgreSQL and
 Cassandra) have additional dependencies. For detailed installation directions,
-see the guide at doc/guide/kea-guide.txt or doc/guide/kea-guide.html or on
-the Kea wiki: https://jenkins.isc.org/job/Kea_doc/guide/kea-guide.html#installation
+see the documentation in doc/sphinx/arm/install.rst text file 
+or on the Kea online docs: https://kea.readthedocs.io/.
+Other optional dependencies are FreeRADIUS client (this requires a subscriber
+only RADIUS hook) and Sysrepo, a system for providing YANG/NETCONF interface.
 
 You can find current OS-specific build/installation
 instructions in our knowledge base at https://kb.isc.org/docs/installing-kea
-
diff --git a/Makefile.am b/Makefile.am
index 8e25a6b..c34c8b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
 # We now build doc after src/, because docgen, a tool to generate API
 # documentation requires libkea-exceptions and libkea-cc.
-SUBDIRS = compatcheck tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@
+SUBDIRS = tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@
 
 USE_LCOV=@USE_LCOV@
 LCOV=@LCOV@
@@ -13,6 +13,7 @@ DISTCHECK_GTEST_CONFIGURE_FLAG=@DISTCHECK_GTEST_CONFIGURE_FLAG@
 DISTCHECK_CRYPTO_CONFIGURE_FLAG=@DISTCHECK_CRYPTO_CONFIGURE_FLAG@
 DISTCHECK_BOOST_CONFIGURE_FLAG=@DISTCHECK_BOOST_CONFIGURE_FLAG@
 DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG=@DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG@
+DISTCHECK_PERFDHCP_CONFIGURE_FLAG=@DISTCHECK_PERFDHCP_CONFIGURE_FLAG@
 DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=@DISTCHECK_KEA_SHELL_CONFIGURE_FLAG@
 DISTCHECK_PREMIUM_CONFIGURE_FLAG=@DISTCHECK_PREMIUM_CONFIGURE_FLAG@
 DISTCHECK_CONTRIB_CONFIGURE_FLAG=@DISTCHECK_CONTRIB_CONFIGURE_FLAG@
@@ -37,6 +38,9 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_BOOST_CONFIGURE_FLAG)
 # Keep the log4cplus path too
 DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG)
 
+# Keep perfdhcp if enabled
+DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_PERFDHCP_CONFIGURE_FLAG)
+
 # Keep kea-shell if enabled
 DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_KEA_SHELL_CONFIGURE_FLAG)
 
@@ -49,7 +53,7 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_CONTRIB_CONFIGURE_FLAG)
 # keerp the sysrepo config
 DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_SYSREPO_CONFIGURE_FLAG)
 
-dist_doc_DATA = AUTHORS COPYING ChangeLog README
+dist_doc_DATA = AUTHORS COPYING ChangeLog README CONTRIBUTING.md
 
 .PHONY: check-valgrind check-valgrind-suppress
 
@@ -142,10 +146,16 @@ cppcheck:
 		--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
 		src
 
+# this is a shortcut that builds only documentation dependecies and documentation itself
+docs:
+	$(MAKE) -C doc/sphinx
+
+
 # These steps are necessary during installation
 install-exec-hook:
 	mkdir -p $(DESTDIR)${localstatedir}/log/
-	mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
+	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
 
 EXTRA_DIST  = tools/path_replacer.sh
 EXTRA_DIST += tools/mk_cfgrpt.sh
@@ -153,9 +163,6 @@ EXTRA_DIST += tools/mk_cfgrpt.sh
 #### include external sources in the distributed tarball:
 EXTRA_DIST += ext/coroutine/coroutine.hpp
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dns++.pc
-
 CLEANFILES = $(abs_top_builddir)/logger_lockfile
 
 # config.h may be included by headers supplied for building user-written
diff --git a/Makefile.in b/Makefile.in
index 168e81c..fa93e9c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,7 +110,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = dns++.pc kea_version.h
+CONFIG_CLEAN_FILES = kea_version.h
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -166,9 +166,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
-	"$(DESTDIR)$(pkgincludedir)"
-DATA = $(dist_doc_DATA) $(pkgconfig_DATA)
+am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgincludedir)"
+DATA = $(dist_doc_DATA)
 HEADERS = $(pkginclude_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -201,9 +200,9 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/dns++.pc.in $(srcdir)/kea_version.h.in AUTHORS \
-	COPYING ChangeLog INSTALL README compile config.guess \
-	config.sub install-sh ltmain.sh missing py-compile ylwrap
+	$(srcdir)/kea_version.h.in AUTHORS COPYING ChangeLog INSTALL \
+	README compile config.guess config.sub install-sh ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -283,7 +282,6 @@ CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DBLATEX = @DBLATEX@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DISTCHECK_BENCHMARK_CONFIGURE_FLAG = @DISTCHECK_BENCHMARK_CONFIGURE_FLAG@
@@ -293,6 +291,7 @@ DISTCHECK_CRYPTO_CONFIGURE_FLAG = @DISTCHECK_CRYPTO_CONFIGURE_FLAG@
 DISTCHECK_GTEST_CONFIGURE_FLAG = @DISTCHECK_GTEST_CONFIGURE_FLAG@
 DISTCHECK_KEA_SHELL_CONFIGURE_FLAG = @DISTCHECK_KEA_SHELL_CONFIGURE_FLAG@
 DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG = @DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG@
+DISTCHECK_PERFDHCP_CONFIGURE_FLAG = @DISTCHECK_PERFDHCP_CONFIGURE_FLAG@
 DISTCHECK_PREMIUM_CONFIGURE_FLAG = @DISTCHECK_PREMIUM_CONFIGURE_FLAG@
 DISTCHECK_SYSREPO_CONFIGURE_FLAG = @DISTCHECK_SYSREPO_CONFIGURE_FLAG@
 DLLTOOL = @DLLTOOL@
@@ -302,7 +301,6 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-ELINKS = @ELINKS@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GENHTML = @GENHTML@
@@ -353,6 +351,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PDFLATEX = @PDFLATEX@
 PERL = @PERL@
 PGSQL_CPPFLAGS = @PGSQL_CPPFLAGS@
 PGSQL_LIBS = @PGSQL_LIBS@
@@ -370,17 +369,17 @@ SED = @SED@
 SEP = @SEP@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SPHINXBUILD = @SPHINXBUILD@
 STRIP = @STRIP@
 SYSREPO_CPPFLAGS = @SYSREPO_CPPFLAGS@
+SYSREPO_INCLUDEDIR = @SYSREPO_INCLUDEDIR@
 SYSREPO_LIBS = @SYSREPO_LIBS@
 SYSREPO_REPO = @SYSREPO_REPO@
 USE_LCOV = @USE_LCOV@
 VALGRIND = @VALGRIND@
 VERSION = @VERSION@
 WARNING_GCC_44_STRICT_ALIASING_CFLAG = @WARNING_GCC_44_STRICT_ALIASING_CFLAG@
-XSLTPROC = @XSLTPROC@
 YACC = @YACC@
-YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -445,7 +444,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
 
 # We now build doc after src/, because docgen, a tool to generate API
 # documentation requires libkea-exceptions and libkea-cc.
-SUBDIRS = compatcheck tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@
+SUBDIRS = tools . ext src doc m4macros @PREMIUM_DIR@ @CONTRIB_DIR@
 OVERALL_COVERAGE_DIR = $(abs_top_builddir)/coverage-cpp-html
 DISTCLEANFILES = config.report
 
@@ -459,6 +458,8 @@ DISTCLEANFILES = config.report
 
 # Keep the log4cplus path too
 
+# Keep perfdhcp if enabled
+
 # Keep kea-shell if enabled
 
 # Keep the premium config
@@ -471,11 +472,12 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations \
 	$(DISTCHECK_CRYPTO_CONFIGURE_FLAG) \
 	$(DISTCHECK_BOOST_CONFIGURE_FLAG) \
 	$(DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG) \
+	$(DISTCHECK_PERFDHCP_CONFIGURE_FLAG) \
 	$(DISTCHECK_KEA_SHELL_CONFIGURE_FLAG) \
 	$(DISTCHECK_PREMIUM_CONFIGURE_FLAG) \
 	$(DISTCHECK_CONTRIB_CONFIGURE_FLAG) \
 	$(DISTCHECK_SYSREPO_CONFIGURE_FLAG)
-dist_doc_DATA = AUTHORS COPYING ChangeLog README
+dist_doc_DATA = AUTHORS COPYING ChangeLog README CONTRIBUTING.md
 @HAVE_BOTAN_FALSE@BOTAN_PATH = 
 @HAVE_BOTAN_TRUE@BOTAN_PATH = botan/\*
 @HAVE_OPENSSL_FALSE@OPENSSL_PATH = 
@@ -484,8 +486,6 @@ dist_doc_DATA = AUTHORS COPYING ChangeLog README
 #### include external sources in the distributed tarball:
 EXTRA_DIST = tools/path_replacer.sh tools/mk_cfgrpt.sh \
 	ext/coroutine/coroutine.hpp
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = dns++.pc
 CLEANFILES = $(abs_top_builddir)/logger_lockfile
 
 # config.h may be included by headers supplied for building user-written
@@ -543,8 +543,6 @@ $(srcdir)/config.h.in:  $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
-dns++.pc: $(top_builddir)/config.status $(srcdir)/dns++.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 kea_version.h: $(top_builddir)/config.status $(srcdir)/kea_version.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
@@ -577,27 +575,6 @@ uninstall-dist_docDATA:
 	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-pkgincludeHEADERS: $(pkginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
@@ -919,7 +896,7 @@ check: check-recursive
 all-am: Makefile $(DATA) $(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)"; do \
+	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -976,8 +953,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-dist_docDATA install-pkgconfigDATA \
-	install-pkgincludeHEADERS
+install-data-am: install-dist_docDATA install-pkgincludeHEADERS
 
 install-dvi: install-dvi-recursive
 
@@ -1024,8 +1000,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-dist_docDATA uninstall-pkgconfigDATA \
-	uninstall-pkgincludeHEADERS
+uninstall-am: uninstall-dist_docDATA uninstall-pkgincludeHEADERS
 
 .MAKE: $(am__recursive_targets) all install-am install-exec-am \
 	install-strip
@@ -1041,12 +1016,12 @@ uninstall-am: uninstall-dist_docDATA uninstall-pkgconfigDATA \
 	install-dist_docDATA install-dvi install-dvi-am install-exec \
 	install-exec-am install-exec-hook install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-pkgconfigDATA install-pkgincludeHEADERS \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
+	install-pdf-am install-pkgincludeHEADERS install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-dist_docDATA uninstall-pkgconfigDATA \
+	uninstall-am uninstall-dist_docDATA \
 	uninstall-pkgincludeHEADERS
 
 .PRECIOUS: Makefile
@@ -1127,10 +1102,15 @@ cppcheck:
 		--template '{file}:{line}: check_fail: {message} ({severity},{id})' \
 		src
 
+# this is a shortcut that builds only documentation dependecies and documentation itself
+docs:
+	$(MAKE) -C doc/sphinx
+
 # These steps are necessary during installation
 install-exec-hook:
 	mkdir -p $(DESTDIR)${localstatedir}/log/
-	mkdir -p $(DESTDIR)${localstatedir}/run/${PACKAGE_NAME}
+	mkdir -p $(DESTDIR)${localstatedir}/lib/${PACKAGE_NAME}
+	mkdir -p $(DESTDIR)${runstatedir}/${PACKAGE_NAME}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/README b/README
index 2de72d7..8ad2657 100644
--- a/README
+++ b/README
@@ -1,17 +1,16 @@
 Kea provides DHCPv4 and DHCPv6 servers, a dynamic DNS update module,
-a portable DHCP library, libdhcp++, control agent that provides management
-REST interface, netconf agent that provides a YANG/NETCONF interface for Kea,
+a portable DHCP library, libdhcp++, a control agent that provides a management
+REST interface, a NETCONF agent that provides a YANG/NETCONF interface for Kea,
 and a DHCP benchmarking tool, perfdhcp.
 
-Kea is developed by Internet Systems Consortium.
+Kea is developed by Internet Systems Consortium, Inc.
 
-The developers website is at https://gitlab.isc.org/isc-projects/kea
+The developers' website is at https://gitlab.isc.org/isc-projects/kea.
 
-Limitations, known issues and feature requests can be found
-at https://gitlab.isc.org/isc-projects/kea/wikis/known-issues-list
+Limitations, known issues, and feature requests can be found
+at https://gitlab.isc.org/isc-projects/kea/wikis/known-issues-list.
 
-If you are thinking about contributing a patch, please read this first:
-https://jenkins.isc.org/job/Kea_doc/doxygen/d7/df4/contributorGuide.html
+If you are thinking about contributing a patch, please read the
+Contributor's Guide first.
 
-The Kea mailing lists are available via
-https://lists.isc.org/
+The Kea mailing lists are available via https://lists.isc.org/.
diff --git a/compatcheck/Makefile.am b/compatcheck/Makefile.am
deleted file mode 100644
index 6cc4036..0000000
--- a/compatcheck/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-# We're going to abuse install-data-local for a pre-install check.  This may
-# not be the cleanest way to do this type of job, but that's the least ugly
-# one we've found.
-#
-# Note also that if any test needs to examine some file that has possibly
-# been installed before (e.g., older DB or configuration file), it should be
-# referenced with the prefix of DESTDIR.  Otherwise
-# 'make DESTDIR=/somewhere install' may not work.
-install-data-local:
-	if test -e $(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3; then \
-		$(SHELL) $(top_builddir)/src/bin/dbutil/run_dbutil.sh --check \
-		$(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3 || \
-		(echo "\nSQLite3 DB file schema version is old.  " \
-		"Please run: " \
-		"$(abs_top_builddir)/src/bin/dbutil/run_dbutil.sh --upgrade " \
-		"$(DESTDIR)$(localstatedir)/$(PACKAGE)/zone.sqlite3"; exit 1) \
-	fi
diff --git a/compatcheck/README b/compatcheck/README
deleted file mode 100644
index 3c07c37..0000000
--- a/compatcheck/README
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory is a collection of compatibility checker programs.
-They will be run before any other installation attempts on 'make install'
-to see if the installation causes any substantial compatibility problems
-with existing configurations.  If any checker program finds an issue,
-'make install' will stop at that point.
diff --git a/config.guess b/config.guess
index 1659250..2e9ad7f 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2016-10-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-08-20'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <[e-mail]>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -237,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -268,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -376,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -410,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -635,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -680,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -697,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -807,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -896,7 +903,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -919,7 +926,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -965,6 +972,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -990,6 +1000,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1022,6 +1035,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1120,7 +1136,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1269,6 +1285,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1282,9 +1301,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1306,7 +1325,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1337,7 +1356,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1379,7 +1398,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1390,23 +1409,25 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <[e-mail]> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to [e-mail] to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/config.h b/config.h
index 6926b8e..b923481 100644
--- a/config.h
+++ b/config.h
@@ -22,9 +22,15 @@
 /* Define to 1 if you have the <boost/asio/ip/address.hpp> header file. */
 #define HAVE_BOOST_ASIO_IP_ADDRESS_HPP 1
 
+/* Define to 1 if you have the <boost/atomic.hpp> header file. */
+#define HAVE_BOOST_ATOMIC_HPP 1
+
 /* Define to 1 if you have the <boost/bind.hpp> header file. */
 #define HAVE_BOOST_BIND_HPP 1
 
+/* Define to 1 if you have the <boost/circular_buffer.hpp> header file. */
+#define HAVE_BOOST_CIRCULAR_BUFFER_HPP 1
+
 /* Define to 1 if you have the
    <boost/date_time/posix_time/posix_time_types.hpp> header file. */
 #define HAVE_BOOST_DATE_TIME_POSIX_TIME_POSIX_TIME_TYPES_HPP 1
@@ -52,7 +58,7 @@
 /* #undef HAVE_CQL */
 
 /* Define to 1 if gtest defines edit_distance::CreateUnifiedDiff */
-#define HAVE_CREATE_UNIFIED_DIFF 1
+/* #undef HAVE_CREATE_UNIFIED_DIFF */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #define HAVE_DLFCN_H 1
@@ -72,12 +78,18 @@
 /* MySQL is present */
 /* #undef HAVE_MYSQL */
 
+/* MySQL uses my_bool */
+/* #undef HAVE_MYSQL_MY_BOOL */
+
 /* Check for optreset? */
 /* #undef HAVE_OPTRESET */
 
 /* PostgreSQL is present */
 /* #undef HAVE_PGSQL */
 
+/* Using sysrepo > 0.7.7 */
+/* #undef HAVE_POST_0_7_7_SYSREPO */
+
 /* Using sysrepo < 0.7.6 */
 /* #undef HAVE_PRE_0_7_6_SYSREPO */
 
@@ -88,9 +100,6 @@
    sun_len */
 /* #undef HAVE_SA_LEN */
 
-/* Define to 1 if you have the `srandomdev' function. */
-/* #undef HAVE_SRANDOMDEV */
-
 /* Define to 1 if stdbool.h conforms to C99. */
 /* #undef HAVE_STDBOOL_H */
 
@@ -136,6 +145,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 /* #undef HAVE__BOOL */
 
+/* Explicit initialization of log4cplus possible */
+/* #undef LOG4CPLUS_INITIALIZER_H */
+
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #define LT_OBJDIR ".libs/"
 
@@ -170,7 +182,7 @@
 #define PACKAGE_NAME "kea"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "kea 1.5.0"
+#define PACKAGE_STRING "kea 1.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "kea"
@@ -179,7 +191,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.0"
+#define PACKAGE_VERSION "1.6.1"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -191,13 +203,13 @@
 /* #undef USE_STATIC_LINK */
 
 /* Version number of package */
-#define VERSION "1.5.0"
+#define VERSION "1.6.1"
 
 /* Compile with Botan crypto */
-#define WITH_BOTAN /**/
+/* #undef WITH_BOTAN */
 
 /* Compile with OpenSSL crypto */
-/* #undef WITH_OPENSSL */
+#define WITH_OPENSSL /**/
 
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
diff --git a/config.h.in b/config.h.in
index ae522be..4dc69f5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -21,9 +21,15 @@
 /* Define to 1 if you have the <boost/asio/ip/address.hpp> header file. */
 #undef HAVE_BOOST_ASIO_IP_ADDRESS_HPP
 
+/* Define to 1 if you have the <boost/atomic.hpp> header file. */
+#undef HAVE_BOOST_ATOMIC_HPP
+
 /* Define to 1 if you have the <boost/bind.hpp> header file. */
 #undef HAVE_BOOST_BIND_HPP
 
+/* Define to 1 if you have the <boost/circular_buffer.hpp> header file. */
+#undef HAVE_BOOST_CIRCULAR_BUFFER_HPP
+
 /* Define to 1 if you have the
    <boost/date_time/posix_time/posix_time_types.hpp> header file. */
 #undef HAVE_BOOST_DATE_TIME_POSIX_TIME_POSIX_TIME_TYPES_HPP
@@ -71,12 +77,18 @@
 /* MySQL is present */
 #undef HAVE_MYSQL
 
+/* MySQL uses my_bool */
+#undef HAVE_MYSQL_MY_BOOL
+
 /* Check for optreset? */
 #undef HAVE_OPTRESET
 
 /* PostgreSQL is present */
 #undef HAVE_PGSQL
 
+/* Using sysrepo > 0.7.7 */
+#undef HAVE_POST_0_7_7_SYSREPO
+
 /* Using sysrepo < 0.7.6 */
 #undef HAVE_PRE_0_7_6_SYSREPO
 
@@ -87,9 +99,6 @@
    sun_len */
 #undef HAVE_SA_LEN
 
-/* Define to 1 if you have the `srandomdev' function. */
-#undef HAVE_SRANDOMDEV
-
 /* Define to 1 if stdbool.h conforms to C99. */
 #undef HAVE_STDBOOL_H
 
@@ -135,6 +144,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* Explicit initialization of log4cplus possible */
+#undef LOG4CPLUS_INITIALIZER_H
+
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
diff --git a/config.sub b/config.sub
index 1acc966..dd2ca93 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-08-20'
+timestamp='2016-11-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-08-20'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-08-20'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <[e-mail]>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -118,7 +117,7 @@ case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -302,6 +301,7 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -429,6 +429,7 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
@@ -521,7 +522,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
+	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
@@ -644,6 +645,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -1023,7 +1032,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1033,7 +1042,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1383,14 +1392,14 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1408,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1531,6 +1541,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
diff --git a/configure b/configure
index a80fba9..77c0805 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for kea 1.5.0.
+# Generated by GNU Autoconf 2.69 for kea 1.6.1.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='kea'
 PACKAGE_TARNAME='kea'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='kea 1.5.0'
+PACKAGE_VERSION='1.6.1'
+PACKAGE_STRING='kea 1.6.1'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -653,18 +653,31 @@ INSTALL_CONFIGURATIONS_FALSE
 INSTALL_CONFIGURATIONS_TRUE
 GENERATE_DOCS_FALSE
 GENERATE_DOCS_TRUE
-HAVE_DBLATEX_FALSE
-HAVE_DBLATEX_TRUE
-DBLATEX
-ELINKS
-XSLTPROC
+HAVE_PDFLATEX_FALSE
+HAVE_PDFLATEX_TRUE
+PDFLATEX
+SPHINXBUILD
+PKGPYTHONDIR
+DISTCHECK_KEA_SHELL_CONFIGURE_FLAG
+KEA_SHELL_FALSE
+KEA_SHELL_TRUE
+pkgpyexecdir
+pyexecdir
+pkgpythondir
+pythondir
+PYTHON_PLATFORM
+PYTHON_EXEC_PREFIX
+PYTHON_PREFIX
+PYTHON_VERSION
+PYTHON
 GENERATE_PARSER_FALSE
 GENERATE_PARSER_TRUE
-YFLAGS
 YACC
 LEXLIB
 LEX_OUTPUT_ROOT
 LEX
+GENERATE_MESSAGES_FALSE
+GENERATE_MESSAGES_TRUE
 PERL
 BENCHMARK_SOURCE
 BENCHMARK_LDADD
@@ -697,6 +710,7 @@ HAVE_SYSREPO_TRUE
 SYSREPO_REPO
 SYSREPO_LIBS
 SYSREPO_CPPFLAGS
+SYSREPO_INCLUDEDIR
 DISTCHECK_SYSREPO_CONFIGURE_FLAG
 HAVE_CQL_FALSE
 HAVE_CQL_TRUE
@@ -745,19 +759,9 @@ OS_BSD_TRUE
 OS_LINUX_FALSE
 OS_LINUX_TRUE
 KEA_CXXFLAGS
-PKGPYTHONDIR
-DISTCHECK_KEA_SHELL_CONFIGURE_FLAG
-KEA_SHELL_FALSE
-KEA_SHELL_TRUE
-pkgpyexecdir
-pyexecdir
-pkgpythondir
-pythondir
-PYTHON_PLATFORM
-PYTHON_EXEC_PREFIX
-PYTHON_PREFIX
-PYTHON_VERSION
-PYTHON
+DISTCHECK_PERFDHCP_CONFIGURE_FLAG
+PERFDHCP_FALSE
+PERFDHCP_TRUE
 USE_STATIC_LINK_FALSE
 USE_STATIC_LINK_TRUE
 WARNING_GCC_44_STRICT_ALIASING_CFLAG
@@ -802,8 +806,6 @@ PREMIUM_DIR
 DEBUG_ENABLED_FALSE
 DEBUG_ENABLED_TRUE
 PKG_CONFIG
-CROSS_COMPILING_FALSE
-CROSS_COMPILING_TRUE
 SEP
 KEA_SRCID
 am__fastdepCXX_FALSE
@@ -914,7 +916,7 @@ enable_libtool_lock
 enable_rpath
 with_werror
 enable_static_link
-enable_shell
+enable_perfdhcp
 with_gtest_source
 with_gtest
 with_lcov
@@ -934,8 +936,13 @@ with_boost_include
 with_boost_libs
 with_boost_lib_dir
 enable_boost_headers_only
+enable_generate_messages
 enable_generate_parser
+enable_shell
 enable_generate_docs
+with_site_packages
+with_sphinx
+with_pdflatex
 enable_install_configurations
 enable_logger_checks
 '
@@ -954,8 +961,7 @@ LT_SYS_LIBRARY_PATH
 CPP
 CXXCPP
 PYTHON
-YACC
-YFLAGS'
+runstatedir'
 
 
 # Initialize some variables set by options.
@@ -1506,7 +1512,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures kea 1.5.0 to adapt to many kinds of systems.
+\`configure' configures kea 1.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1577,7 +1583,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of kea 1.5.0:";;
+     short | recursive ) echo "Configuration of kea 1.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1599,8 +1605,8 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-rpath         don't hardcode library path into binaries
   --enable-static-link    build programs with static link [[default=no]]
-  --enable-shell          enable kea-shell, a text management client for
-                          Control Agent [default=no]
+  --enable-perfdhcp       enable perfdhcp, a DHCP benchmarking tool
+                          [default=no]
   --enable-cql-static-lib build programs with cassandra cpp driver static
                           library [[default=no]]
   --enable-boost-headers-only
@@ -1608,11 +1614,16 @@ Optional Features:
                           boost_system library. This is NOT recommended as it
                           may result in non-optimized code on some platforms
                           or introduce runtime errors on others.
+  --enable-generate-messages
+                          indicates that the messages files will be
+                          regenerated. [default=no]
   --enable-generate-parser
                           indicates that the parsers will be regenerated. This
                           implies that the bison and flex are required
                           [default=no]
-  --enable-generate-docs  regenerate documentation using Docbook [default=no]
+  --enable-shell          enable kea-shell, a text management client for
+                          Control Agent [default=no]
+  --enable-generate-docs  regenerate documentation using Sphinx [default=no]
   --disable-install-configurations
                           do not install configuration
   --enable-logger-checks  check logger messages [default=no]
@@ -1633,7 +1644,8 @@ Optional Packages:
                           location of the Googletest source
   --with-gtest=PATH       specify a path to gtest header files (PATH/include)
                           and library (PATH/lib)
-  --with-lcov=PROGRAM         enable gtest and coverage target using the specified lcov
+  --with-lcov=PROGRAM     enable gtest and coverage target using the specified
+                          lcov
   --with-benchmark-source=PATH
                           location of the benchmark source
   --with-benchmark=PATH   specify a path to benchmark header files
@@ -1658,6 +1670,9 @@ Optional Packages:
                           '-lboost_system'
   --with-boost-lib-dir=PATH
                           specify directory where to find Boost libraries
+  --with-site-packages    place to install Kea Python module
+  --with-sphinx=PATH      path to sphinx-build tool
+  --with-pdflatex=PATH    path to pdflatex tool
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1674,12 +1689,7 @@ Some influential environment variables:
   CPP         C preprocessor
   CXXCPP      C++ preprocessor
   PYTHON      the Python interpreter
-  YACC        The `Yet Another Compiler Compiler' implementation to use.
-              Defaults to the first program found out of: `bison -y', `byacc',
-              `yacc'.
-  YFLAGS      The list of arguments that will be passed by default to $YACC.
-              This script will default YFLAGS to the empty string to avoid a
-              default value of `-d' given by some make applications.
+  runstatedir $localstatedir/run for autoconf < 2.70
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1747,7 +1757,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-kea configure 1.5.0
+kea configure 1.6.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2446,7 +2456,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by kea $as_me 1.5.0, which was
+It was created by kea $as_me 1.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3316,7 +3326,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='kea'
- VERSION='1.5.0'
+ VERSION='1.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4260,34 +4270,6 @@ if test "$sep" = "__NONE__"; then
 fi
 
 
-# If cross compiling assume the message compiler executable was
-# magically already in place...
-if test "$cross_compiling" = "yes"; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"build (vs. host) compiled message compiler\"" >&5
-$as_echo_n "checking \"build (vs. host) compiled message compiler\"... " >&6; }
-	if test -x "${srcdir}/src/lib/log/compiler/message"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"you must install a message compiler in:\"" >&5
-$as_echo "$as_me: WARNING: \"you must install a message compiler in:\"" >&2;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"    ${srcdir}/src/lib/log/compiler/message\"" >&5
-$as_echo "$as_me: WARNING: \"    ${srcdir}/src/lib/log/compiler/message\"" >&2;}
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"compiled for build ($build).\"" >&5
-$as_echo "$as_me: WARNING: \"compiled for build ($build).\"" >&2;}
-	fi
-fi
- if test "$cross_compiling" = "yes"; then
-  CROSS_COMPILING_TRUE=
-  CROSS_COMPILING_FALSE='#'
-else
-  CROSS_COMPILING_TRUE='#'
-  CROSS_COMPILING_FALSE=
-fi
-
-
 # pkg-config can be required.
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
@@ -17357,356 +17339,185 @@ $as_echo "#define HAVE_BROKEN_GET_IPV6_USE_MIN_MTU 1" >>confdefs.h
         ;;
 esac
 
-# Kea-shell is written in python. It can work with python 2.7 or any 3.x.
-# It may likely work with earlier versions, but 2.7 was the oldest one we tested
-# it with. We require python only if kea-shell was enabled. It is disabled
-# by default to not introduce hard dependency on python.
-# Check whether --enable-shell was given.
-if test "${enable_shell+set}" = set; then :
-  enableval=$enable_shell; enable_shell=$enableval
+# Made perfdhcp optional.
+# Check whether --enable-perfdhcp was given.
+if test "${enable_perfdhcp+set}" = set; then :
+  enableval=$enable_perfdhcp; enable_perfdhcp=$enableval
 else
-  enable_shell=no
+  enable_perfdhcp=no
 fi
 
 
-DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=
-PKGPYTHONDIR=
-
-if test "x$enable_shell" != xno ; then
-# If kea-shell is enabled, we really need python. 2.7 or anything newer will do.
-# We try to find 3.x first. If not found, we can do with 2.7.
+DISTCHECK_PERFDHCP_CONFIGURE_FLAG=
+if test "x$enable_perfdhcp" != xno ; then
+  DISTCHECK_PERFDHCP_CONFIGURE_FLAG="--enable-perfdhcp"
+fi
 
+# Export to makefiles the info whether we have perfdhcp enabled or not
+ if test x$enable_perfdhcp != xno; then
+  PERFDHCP_TRUE=
+  PERFDHCP_FALSE='#'
+else
+  PERFDHCP_TRUE='#'
+  PERFDHCP_FALSE=
+fi
 
 
 
+# produce PIC unless we disable shared libraries. need this for python bindings.
+if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
+   KEA_CXXFLAGS="$KEA_CXXFLAGS -fPIC"
+fi
 
+# Look for glib static libs if they're trying to do static builds
+if test $enable_static_link != "no"; then
+   CXX_SAVED=$CXX
+   CXX="$CXX -static"
 
-        if test -n "$PYTHON"; then
-      # If the user set $PYTHON, use it and don't search something else.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.7" >&5
-$as_echo_n "checking whether $PYTHON version is >= 2.7... " >&6; }
-      prog="import sys
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0]
-minverhex = 0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
-  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
-   ($PYTHON -c "$prog") >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <math.h>
+int
+main ()
+{
+(void)sqrt(-1.0);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for static glib libraries... yes" >&5
+$as_echo "checking for static glib libraries... yes" >&6; }
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			       as_fn_error $? "Python interpreter is too old" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for static glib libraries... no" >&5
+$as_echo "checking for static glib libraries... no" >&6; }
+      as_fn_error $? "Building with --enable-static-link does not work. You appear to be missing glib static libraries. Check config.log for details." "$LINENO" 5
 fi
-      am_display_PYTHON=$PYTHON
-    else
-      # Otherwise, try each interpreter until we find one that satisfies
-      # VERSION.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.7" >&5
-$as_echo_n "checking for a Python interpreter with version >= 2.7... " >&6; }
-if ${am_cv_pathless_PYTHON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
-	for am_cv_pathless_PYTHON in python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4   python3.3 python3.2 python3.1 python3.0 python python2 python2.7 none; do
-	  test "$am_cv_pathless_PYTHON" = none && break
-	  prog="import sys
-# split strings by '.' and convert to numeric.  Append some zeros
-# because we need at least 4 digits for the hex conversion.
-# map returns an iterator in Python 3.0 and a list in 2.x
-minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0]
-minverhex = 0
-# xrange is not present in Python 3.0 and range returns an iterator
-for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-sys.exit(sys.hexversion < minverhex)"
-  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
-   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then :
-  break
-fi
-	done
+   CXX=$CXX_SAVED
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-$as_echo "$am_cv_pathless_PYTHON" >&6; }
-      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      if test "$am_cv_pathless_PYTHON" = none; then
-	PYTHON=:
-      else
-        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-set dummy $am_cv_pathless_PYTHON; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PYTHON+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PYTHON in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-PYTHON=$ac_cv_path_PYTHON
-if test -n "$PYTHON"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-$as_echo "$PYTHON" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
 
 
-      fi
-      am_display_PYTHON=$am_cv_pathless_PYTHON
-    fi
+# Checks for libraries.
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_pton" >&5
+$as_echo_n "checking for library containing inet_pton... " >&6; }
+if ${ac_cv_search_inet_pton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  if test "$PYTHON" = :; then
-      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char inet_pton ();
+int
+main ()
+{
+return inet_pton ();
+  ;
+  return 0;
+}
+_ACEOF
+for ac_lib in '' nsl; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
   else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_inet_pton=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if ${ac_cv_search_inet_pton+:} false; then :
+  break
+fi
+done
+if ${ac_cv_search_inet_pton+:} false; then :
 
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if ${am_cv_python_version+:} false; then :
-  $as_echo_n "(cached) " >&6
 else
-  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+  ac_cv_search_inet_pton=no
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-$as_echo "$am_cv_python_version" >&6; }
-  PYTHON_VERSION=$am_cv_python_version
-
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_pton" >&5
+$as_echo "$ac_cv_search_inet_pton" >&6; }
+ac_res=$ac_cv_search_inet_pton
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+fi
 
-  PYTHON_PREFIX='${prefix}'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing recvfrom" >&5
+$as_echo_n "checking for library containing recvfrom... " >&6; }
+if ${ac_cv_search_recvfrom+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-  PYTHON_EXEC_PREFIX='${exec_prefix}'
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if ${am_cv_python_platform+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-$as_echo "$am_cv_python_platform" >&6; }
-  PYTHON_PLATFORM=$am_cv_python_platform
-
-
-  # Just factor out some code duplication.
-  am_python_setup_sysconfig="\
-import sys
-# Prefer sysconfig over distutils.sysconfig, for better compatibility
-# with python 3.x.  See automake bug#10227.
-try:
-    import sysconfig
-except ImportError:
-    can_use_sysconfig = 0
-else:
-    can_use_sysconfig = 1
-# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
-# <https://github.com/pypa/virtualenv/issues/118>
-try:
-    from platform import python_implementation
-    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-        can_use_sysconfig = 0
-except ImportError:
-    pass"
-
-
-            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if ${am_cv_python_pythondir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$prefix" = xNONE
-     then
-       am_py_prefix=$ac_default_prefix
-     else
-       am_py_prefix=$prefix
-     fi
-     am_cv_python_pythondir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
-    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
-else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
-     case $am_cv_python_pythondir in
-     $am_py_prefix*)
-       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
-       ;;
-     *)
-       case $am_py_prefix in
-         /usr|/System*) ;;
-         *)
-	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
-	  ;;
-       esac
-       ;;
-     esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-$as_echo "$am_cv_python_pythondir" >&6; }
-  pythondir=$am_cv_python_pythondir
-
-
-
-  pkgpythondir=\${pythondir}/$PACKAGE
-
-
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if ${am_cv_python_pyexecdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$exec_prefix" = xNONE
-     then
-       am_py_exec_prefix=$am_py_prefix
-     else
-       am_py_exec_prefix=$exec_prefix
-     fi
-     am_cv_python_pyexecdir=`$PYTHON -c "
-$am_python_setup_sysconfig
-if can_use_sysconfig:
-    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
-else:
-    from distutils import sysconfig
-    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
-sys.stdout.write(sitedir)"`
-     case $am_cv_python_pyexecdir in
-     $am_py_exec_prefix*)
-       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
-       ;;
-     *)
-       case $am_py_exec_prefix in
-         /usr|/System*) ;;
-         *)
-	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
-	   ;;
-       esac
-       ;;
-     esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-$as_echo "$am_cv_python_pyexecdir" >&6; }
-  pyexecdir=$am_cv_python_pyexecdir
-
-
-
-  pkgpyexecdir=\${pyexecdir}/$PACKAGE
-
-
-
-  fi
-
-
-  # pkgpythondir needs to be expanded
-  saved_prefix="$prefix"
-  if test "$prefix" = "NONE"; then
-    prefix=$ac_default_prefix
-  fi
-  PKGPYTHONDIR="$pkgpythondir"
-  OLD=
-  while test "x$OLD" != "x$PKGPYTHONDIR"; do
-    OLD="$PKGPYTHONDIR"
-    eval PKGPYTHONDIR="\"$OLD\""
-  done
-  prefix="$saved_prefix"
-  DISTCHECK_KEA_SHELL_CONFIGURE_FLAG="--enable-shell"
-else
-  PYTHON=no
-fi
-
-# Export to makefiles the info whether we have shell enabled or not
- if test x$enable_shell != xno; then
-  KEA_SHELL_TRUE=
-  KEA_SHELL_FALSE='#'
-else
-  KEA_SHELL_TRUE='#'
-  KEA_SHELL_FALSE=
-fi
-
-
-
-
-# produce PIC unless we disable shared libraries. need this for python bindings.
-if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
-   KEA_CXXFLAGS="$KEA_CXXFLAGS -fPIC"
-fi
-
-# Look for glib static libs if they're trying to do static builds
-if test $enable_static_link != "no"; then
-   CXX_SAVED=$CXX
-   CXX="$CXX -static"
-
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <math.h>
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char recvfrom ();
 int
 main ()
 {
-(void)sqrt(-1.0);
+return recvfrom ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for static glib libraries... yes" >&5
-$as_echo "checking for static glib libraries... yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for static glib libraries... no" >&5
-$as_echo "checking for static glib libraries... no" >&6; }
-      as_fn_error $? "Building with --enable-static-link does not work. You appear to be missing glib static libraries. Check config.log for details." "$LINENO" 5
+for ac_lib in '' socket; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_search_recvfrom=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-
-   CXX=$CXX_SAVED
+    conftest$ac_exeext
+  if ${ac_cv_search_recvfrom+:} false; then :
+  break
 fi
+done
+if ${ac_cv_search_recvfrom+:} false; then :
 
+else
+  ac_cv_search_recvfrom=no
+fi
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_recvfrom" >&5
+$as_echo "$ac_cv_search_recvfrom" >&6; }
+ac_res=$ac_cv_search_recvfrom
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
+fi
 
-# Checks for libraries.
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_pton" >&5
-$as_echo_n "checking for library containing inet_pton... " >&6; }
-if ${ac_cv_search_inet_pton+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5
+$as_echo_n "checking for library containing nanosleep... " >&6; }
+if ${ac_cv_search_nanosleep+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -17719,16 +17530,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_pton ();
+char nanosleep ();
 int
 main ()
 {
-return inet_pton ();
+return nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl; do
+for ac_lib in '' rt; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -17736,33 +17547,33 @@ for ac_lib in '' nsl; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_search_inet_pton=$ac_res
+  ac_cv_search_nanosleep=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_inet_pton+:} false; then :
+  if ${ac_cv_search_nanosleep+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_inet_pton+:} false; then :
+if ${ac_cv_search_nanosleep+:} false; then :
 
 else
-  ac_cv_search_inet_pton=no
+  ac_cv_search_nanosleep=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_pton" >&5
-$as_echo "$ac_cv_search_inet_pton" >&6; }
-ac_res=$ac_cv_search_inet_pton
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5
+$as_echo "$ac_cv_search_nanosleep" >&6; }
+ac_res=$ac_cv_search_nanosleep
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing recvfrom" >&5
-$as_echo_n "checking for library containing recvfrom... " >&6; }
-if ${ac_cv_search_recvfrom+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
+$as_echo_n "checking for library containing dlsym... " >&6; }
+if ${ac_cv_search_dlsym+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -17775,128 +17586,16 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char recvfrom ();
+char dlsym ();
 int
 main ()
 {
-return recvfrom ();
+return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_search_recvfrom=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_recvfrom+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_recvfrom+:} false; then :
-
-else
-  ac_cv_search_recvfrom=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_recvfrom" >&5
-$as_echo "$ac_cv_search_recvfrom" >&6; }
-ac_res=$ac_cv_search_recvfrom
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing nanosleep" >&5
-$as_echo_n "checking for library containing nanosleep... " >&6; }
-if ${ac_cv_search_nanosleep+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char nanosleep ();
-int
-main ()
-{
-return nanosleep ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' rt; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_search_nanosleep=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_nanosleep+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_nanosleep+:} false; then :
-
-else
-  ac_cv_search_nanosleep=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_nanosleep" >&5
-$as_echo "$ac_cv_search_nanosleep" >&6; }
-ac_res=$ac_cv_search_nanosleep
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlsym" >&5
-$as_echo_n "checking for library containing dlsym... " >&6; }
-if ${ac_cv_search_dlsym+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlsym ();
-int
-main ()
-{
-return dlsym ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dl; do
+for ac_lib in '' dl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -19242,6 +18941,7 @@ $as_echo "$as_me: WARNING: --with-dhcp-mysql has been deprecated, please use --w
 fi
 
 if test "${mysql_config}" = "yes" ; then
+    MYSQL_CONFIG="/usr/bin/mysql_config"
     for d in $defaultdirs
     do
         if test -f $d/bin/mysql_config; then
@@ -19255,11 +18955,12 @@ fi
 
 if test "$MYSQL_CONFIG" != "" ; then
     if test -d "$MYSQL_CONFIG" -o ! -x "$MYSQL_CONFIG" ; then
-        as_fn_error $? "--with-mysql should point to a mysql_config program" "$LINENO" 5
+        as_fn_error $? "MySQL dependencies cannot be found. Please install MySQL libraries or point --with-mysql to mysql_config program if it is located in non-default directory, eg. --with-mysql=/opt/mysql/bin/mysql_config." "$LINENO" 5
     fi
 
     MYSQL_CPPFLAGS=`$MYSQL_CONFIG --cflags`
     MYSQL_LIBS=`$MYSQL_CONFIG --libs`
+    MYSQL_LIBS="$MYSQL_LIBS $CRYPTO_LIBS"
     MYSQL_VERSION=`$MYSQL_CONFIG --version`
 
 
@@ -19279,7 +18980,7 @@ int
 main ()
 {
 MYSQL mysql_handle;
-                              (void) mysql_init(&mysql_handle);
+                          (void) mysql_init(&mysql_handle);
 
   ;
   return 0;
@@ -19291,19 +18992,46 @@ $as_echo "checking for MySQL headers and library... yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for MySQL headers and library... no" >&5
 $as_echo "checking for MySQL headers and library... no" >&6; }
-             as_fn_error $? "Needs MySQL library" "$LINENO" 5
+         as_fn_error $? "Needs MySQL library" "$LINENO" 5
 
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
-    CPPFLAGS=$CPPFLAGS_SAVED
-    LIBS=$LIBS_SAVED
-
     # Note that MYSQL is present in the config.h file
 
 $as_echo "#define HAVE_MYSQL 1" >>confdefs.h
 
+
+    # Check is my_bool is defined.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <mysql.h>
+                          const my_bool MLM_FALSE = 0;
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for MySQL my_bool... yes" >&5
+$as_echo "checking for MySQL my_bool... yes" >&6; }
+
+$as_echo "#define HAVE_MYSQL_MY_BOOL 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for MySQL my_bool... no" >&5
+$as_echo "checking for MySQL my_bool... no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    CPPFLAGS=$CPPFLAGS_SAVED
+    LIBS=$LIBS_SAVED
+
 fi
 
 # Solaris puts FIONREAD in filio.h
@@ -19352,6 +19080,7 @@ $as_echo "$as_me: WARNING: --with-dhcp-pgsql has been deprecated, please use --w
 fi
 
 if test "${pg_config}" = "yes" ; then
+    PG_CONFIG="/usr/bin/pg_config"
     for d in $defaultdirs
     do
         if test -f $d/bin/pg_config; then
@@ -19365,7 +19094,7 @@ fi
 
 if test "$PG_CONFIG" != "" ; then
     if test -d "$PG_CONFIG" -o ! -x "$PG_CONFIG" ; then
-        as_fn_error $? "--with-pgsql should point to a pg_config program" "$LINENO" 5
+        as_fn_error $? "PostgreSQL dependencies cannot be found. Please install PostgreSQL libraries or point --with-pgsql to pg_config program if it is located in non-default directory, eg. --with-pgsql=/opt/pgsql/bin/pg_config." "$LINENO" 5
     fi
 
     PGSQL_CPPFLAGS=`$PG_CONFIG --cppflags`
@@ -19486,11 +19215,18 @@ if test "$CQL_CONFIG" != "" ; then
         as_fn_error $? "--with-cql should point to a pkg-config or cql_config program" "$LINENO" 5
     fi
 
+    $CQL_CONFIG --print-errors $cql_lib
+    if test $? -ne 0; then
+        as_fn_error $? "$CQL_CONFIG $cql_lib failed" "$LINENO" 5
+    fi
+
     CQL_INCLUDEDIR=`$CQL_CONFIG --cflags-only-I $cql_lib`
-    CQL_CPPFLAGS="$CQL_INCLUDEDIR `$CQL_CONFIG --cflags-only-other $cql_lib`"
-    CQL_LIBS="`$CQL_CONFIG --libs $cql_lib`"
+    CQL_CPPFLAGS=`$CQL_CONFIG --cflags-only-other $cql_lib`
+    CQL_LIBS=`$CQL_CONFIG --libs $cql_lib`
+    CQL_LIBS="$CQL_LIBS $CRYPTO_LIBS"
     CQL_VERSION=`$CQL_CONFIG --modversion $cql_lib`
 
+    CQL_CPPFLAGS="${CQL_CPPFLAGS} ${CQL_INCLUDEDIR}"
 
 
 
@@ -19553,6 +19289,9 @@ fi
 
 
 if test "${sysrepo_config}" = "yes" ; then
+    if test "$PKG_CONFIG" = ""; then
+        as_fn_error $? "--with-sysrepo specified without any parameter and pkg-config was not found. Either use --with-sysrepo=path or install pkg-config" "$LINENO" 5
+    fi
     SYSREPO_CONFIG="$PKG_CONFIG"
     DISTCHECK_SYSREPO_CONFIGURE_FLAG="-with-sysrepo=${sysrepo_config}"
 elif test "${sysrepo_config}" != "no" ; then
@@ -19597,6 +19336,7 @@ if test "$SYSREPO_CONFIG" != "" ; then
 
 
 
+
     # Check that a simple program using Sysrepo functions can compile and link.
     CPPFLAGS_SAVED="$CPPFLAGS"
     LIBS_SAVED="$LIBS"
@@ -19644,8 +19384,31 @@ sysrepo::Connection("conn-name");
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Sysrepo C++ bindings headers and library... yes" >&5
-$as_echo "checking for Sysrepo C++ bindings headers and library... yes" >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sysrepo-cpp/Session.hpp>
+int
+main ()
+{
+auto is_empty = [](sysrepo::S_Val v){
+                    return (v->empty()); };
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Sysrepo C++ bindings headers and library, new" >&5
+$as_echo "checking for Sysrepo C++ bindings headers and library, new" >&6; }
+
+$as_echo "#define HAVE_POST_0_7_7_SYSREPO 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Sysrepo C++ bindings headers and library, yes" >&5
+$as_echo "checking for Sysrepo C++ bindings headers and library, yes" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -19717,11 +19480,14 @@ else
         do
                 if test -f $d/include/log4cplus/logger.h; then
                         LOG4CPLUS_INCLUDES="-I$d/include"
-                        LOG4CPLUS_LIBS="-L$d/lib -L$d/lib64"
+                        LOG4CPLUS_LIBS="-L$d/lib"
+                        if test -d $d/lib64; then
+                                LOG4CPLUS_LIBS="$LOG4CPLUS_LIBS -L$d/lib64"
+                        fi
                         break
                 fi
         done
-	DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG="-with-log4cplus"
+        DISTCHECK_LOG4CPLUS_CONFIGURE_FLAG="-with-log4cplus"
 fi
 
 LOG4CPLUS_LIBS="$LOG4CPLUS_LIBS -llog4cplus"
@@ -19793,6 +19559,43 @@ $as_echo "$LOG4CPLUS_VERSION" >&6; }
 CPPFLAGS=$CPPFLAGS_SAVED
 LIBS=$LIBS_SAVED
 
+# Older log4cplus versions (1.2.0) don't have the initializer.h header that
+# would allow explicit initialization. Newer versions (2.0.4 for sure, possibly
+# older as well) have it and it's recommended to use it. We detect whether
+# it's present or not and do explicit initalization if possible.
+CPPFLAGS_SAVED=$CPPFLAGS
+CPPFLAGS="$LOG4CPLUS_INCLUDES $CPPFLAGS"
+LIBS_SAVED="$LIBS"
+LIBS="$LOG4CPLUS_LIBS $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking log4cplus explicit initialization (log4cplus/initializer.h)" >&5
+$as_echo_n "checking log4cplus explicit initialization (log4cplus/initializer.h)... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <log4cplus/initializer.h>
+int
+main ()
+{
+log4cplus::Initializer initializer;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define LOG4CPLUS_INITIALIZER_H 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="$LIBS_SAVED"
+CPPFLAGS=$CPPFLAGS_SAVED
+
 #
 # Configure Boost header path
 #
@@ -19840,10 +19643,10 @@ fi
 # Check the path with some specific headers.
 CPPFLAGS_SAVED="$CPPFLAGS"
 if test "${boost_include_path}" ; then
-	BOOST_INCLUDES="-I${boost_include_path}"
+	BOOST_INCLUDES="-isystem ${boost_include_path}"
 	CPPFLAGS="$CPPFLAGS $BOOST_INCLUDES"
 fi
-for ac_header in boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp boost/date_time/posix_time/posix_time_types.hpp boost/bind.hpp boost/function.hpp boost/asio.hpp boost/asio/ip/address.hpp boost/system/error_code.hpp
+for ac_header in boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp boost/date_time/posix_time/posix_time_types.hpp boost/bind.hpp boost/function.hpp boost/asio.hpp boost/asio/ip/address.hpp boost/system/error_code.hpp boost/atomic.hpp boost/circular_buffer.hpp
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -19875,6 +19678,35 @@ fi
 done
 
 
+# Verify that the path does not include standard headers by mistake.
+# There are two regex.h headers: one is a standard system header (usually
+# in /usr/include) and the second one is provided by boost. If you specify the
+# path to boost in a way that specifies the actual directory, this will mess up
+# the code and we'll end up using the system header rather than the boost. For
+# example, if your boost headers are in /usr/local/include/boost, you should
+# use --with-boost-include=/usr/local/include
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <regex.h>
+#ifdef BOOST_RE_REGEX_H
+#error "boost/regex.h"
+#endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+else
+  as_fn_error $? "${boost_include_path}/regex.h is used in place of /usr/include/regex.h: when specifying path to boost, please omit the /boost at the end of the include path." "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 # clang can cause false positives with -Werror without -Qunused-arguments.
 # it can be triggered if used with ccache.
 ac_fn_cxx_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default"
@@ -20107,9 +19939,34 @@ if ac_fn_cxx_try_link "$LINENO"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Boost system library... yes" >&5
 $as_echo "checking for Boost system library... yes" >&6; }
 else
+  if test "x${BOOST_LIB_DIR}" = "x"; then
+         BOOST_LIB_DIR="$boost_lib_path"
+      fi
+      if test "x${BOOST_LIB_DIR}" != "x"; then
+         BOOST_LIBS="-L$BOOST_LIB_DIR $BOOST_LIBS"
+      fi
+      LIBS="$BOOST_LIBS $LIBS_SAVED"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <boost/system/error_code.hpp>
+int
+main ()
+{
+boost::system::error_code ec;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Boost system library... yes" >&5
+$as_echo "checking for Boost system library... yes" >&6; }
+else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for Boost system library... no" >&5
 $as_echo "checking for Boost system library... no" >&6; }
-      as_fn_error $? "Linking with ${BOOST_LIBS} is not enough: please make sure libboost_system is installed; Check config.log for details, you may be missing other libraries." "$LINENO" 5
+         as_fn_error $? "Linking with ${BOOST_LIBS} is not enough: please make sure libboost_system is installed in an expected location; Check config.log for details, you may be missing other libraries." "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -20514,6 +20371,11 @@ $as_echo "$as_me: WARNING: Found Google Benchmark include but not the library in
         fi
 
     fi
+
+    if test $enable_gtest = no; then
+        as_fn_error $? "--with-benchmark and --with-benchmark-source require --with-gtest or --with-gtest-source" "$LINENO" 5
+    fi
+
 fi
  if test $enable_benchmark != "no"; then
   HAVE_BENCHMARK_TRUE=
@@ -20620,7 +20482,7 @@ fi
 
 #
 # Doesn't seem to be required?
-CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_HEADER_ONLY"
+#CPPFLAGS="$CPPFLAGS -DBOOST_ASIO_HEADER_ONLY"
 #
 # Disable threads: they seems to break things on some systems
 # As now we use threads in boost ASIO this is commented out...
@@ -20635,13 +20497,12 @@ if test "x${BOOST_LIBS}" = "x"; then
 fi
 
 # Check for functions that are not available on all platforms
-for ac_func in pselect srandomdev
+for ac_func in pselect
 do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  ac_fn_cxx_check_func "$LINENO" "pselect" "ac_cv_func_pselect"
+if test "x$ac_cv_func_pselect" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_PSELECT 1
 _ACEOF
 
 fi
@@ -20772,6 +20633,31 @@ done
 
 
 
+# Check whether --enable-generate_messages was given.
+if test "${enable_generate_messages+set}" = set; then :
+  enableval=$enable_generate_messages; enable_generate_messages=$enableval
+else
+  enable_generate_messages=no
+fi
+
+
+ if test x$enable_generate_messages != xno; then
+  GENERATE_MESSAGES_TRUE=
+  GENERATE_MESSAGES_FALSE='#'
+else
+  GENERATE_MESSAGES_TRUE='#'
+  GENERATE_MESSAGES_FALSE=
+fi
+
+
+# cross compiling is not compatible with enable-generate-messages.
+if test "$cross_compiling" = "yes"; then
+    if test "$enable_generate_messages" != "no"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: To build the message compiler is not compatible with cross compiling" >&5
+$as_echo "$as_me: WARNING: To build the message compiler is not compatible with cross compiling" >&2;}
+    fi
+fi
+
 # Check whether --enable-generate_parser was given.
 if test "${enable_generate_parser+set}" = set; then :
   enableval=$enable_generate_parser; enable_generate_parser=$enableval
@@ -20882,172 +20768,513 @@ if ${ac_cv_lib_lex+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
-    ac_save_LIBS=$LIBS
-    ac_cv_lib_lex='none needed'
-    for ac_lib in '' -lfl -ll; do
-      LIBS="$ac_lib $ac_save_LIBS"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_lex=$ac_lib
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # POSIX says lex can declare yytext either as a pointer or an array; the
+# default is implementation-dependent.  Figure out which it is, since
+# not all implementations provide the %pointer and %array declarations.
+ac_cv_prog_lex_yytext_pointer=no
+ac_save_LIBS=$LIBS
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  #define YYTEXT_POINTER 1
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_prog_lex_yytext_pointer=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_save_LIBS
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+if test $ac_cv_prog_lex_yytext_pointer = yes; then
+
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+
+fi
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
+
+fi
+
+# Check if bison is available. Bison is not needed for building Kea sources,
+# unless you want to regenerate grammars
+# Extract the first word of "bison", so it can be a program name with args.
+set dummy bison; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_YACC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $YACC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_YACC="$YACC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+YACC=$ac_cv_path_YACC
+if test -n "$YACC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+if test "x$enable_generate_parser" != "xno"; then
+
+    if test "x$LEX" != "xflex"; then
+       as_fn_error $? "Flex is required for enable-generate-parser, but was not found" "$LINENO" 5
+    fi
+
+    if test "x$YACC" == "x"; then
+       as_fn_error $? "Bison is required for enable-generate-parser, but was not found" "$LINENO" 5
+    fi
+
+# Ok, let's check if we have at least 3.0.0 version of the bison. The code used
+# to generate parsers is roughly based on bison 3.0 examples.
+   cat > bisontest.y << EOF
+%require "3.0.0"
+%token X
+%%
+%start Y;
+Y: X;
+EOF
+# Try to compile.
+    $YACC bisontest.y -o bisontest.cc
+
+    if test $? -ne 0 ; then
+        $YACC -V
+        $RM -f bisontest.y bisontest.cc
+        as_fn_error $? "\"Error with $YACC. Possibly incorrect version? Required at least 3.0.0.\"" "$LINENO" 5
+    fi
+    $RM -f bisontest.y bisontest.cc
+fi
+
+ if test x$enable_generate_parser != xno; then
+  GENERATE_PARSER_TRUE=
+  GENERATE_PARSER_FALSE='#'
+else
+  GENERATE_PARSER_TRUE='#'
+  GENERATE_PARSER_FALSE=
+fi
+
+
+# Kea-shell is written in python. It can work with python 2.7 or any 3.x.
+# It may likely work with earlier versions, but 2.7 was the oldest one we tested
+# it with. We require python only if kea-shell was enabled. It is disabled
+# by default to not introduce hard dependency on python.
+# Check whether --enable-shell was given.
+if test "${enable_shell+set}" = set; then :
+  enableval=$enable_shell; enable_shell=$enableval
+else
+  enable_shell=no
+fi
+
+
+
+# Check whether --enable-generate_docs was given.
+if test "${enable_generate_docs+set}" = set; then :
+  enableval=$enable_generate_docs; enable_generate_docs=$enableval
+else
+  enable_generate_docs=no
+fi
+
+
+
+DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=
+PKGPYTHONDIR=
+shell_report=no
+
+if test "x$enable_shell" != xno -o "x$enable_generate_docs" != xno; then
+# If kea-shell is enabled, we really need python. 2.7 or anything newer will do.
+# We try to find 3.x first. If not found, we can do with 2.7.
+
+
+
+
+
+
+        if test -n "$PYTHON"; then
+      # If the user set $PYTHON, use it and don't search something else.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 2.7" >&5
+$as_echo_n "checking whether $PYTHON version is >= 2.7... " >&6; }
+      prog="import sys
+# split strings by '.' and convert to numeric.  Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
+   ($PYTHON -c "$prog") >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			       as_fn_error $? "Python interpreter is too old" "$LINENO" 5
+fi
+      am_display_PYTHON=$PYTHON
+    else
+      # Otherwise, try each interpreter until we find one that satisfies
+      # VERSION.
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.7" >&5
+$as_echo_n "checking for a Python interpreter with version >= 2.7... " >&6; }
+if ${am_cv_pathless_PYTHON+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	for am_cv_pathless_PYTHON in python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4   python3.3 python3.2 python3.1 python3.0 python python2 python2.7 none; do
+	  test "$am_cv_pathless_PYTHON" = none && break
+	  prog="import sys
+# split strings by '.' and convert to numeric.  Append some zeros
+# because we need at least 4 digits for the hex conversion.
+# map returns an iterator in Python 3.0 and a list in 2.x
+minver = list(map(int, '2.7'.split('.'))) + [0, 0, 0]
+minverhex = 0
+# xrange is not present in Python 3.0 and range returns an iterator
+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
+sys.exit(sys.hexversion < minverhex)"
+  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
+   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then :
+  break
+fi
+	done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
+$as_echo "$am_cv_pathless_PYTHON" >&6; }
+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
+      if test "$am_cv_pathless_PYTHON" = none; then
+	PYTHON=:
+      else
+        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
+set dummy $am_cv_pathless_PYTHON; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PYTHON+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PYTHON in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PYTHON=$ac_cv_path_PYTHON
+if test -n "$PYTHON"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+      fi
+      am_display_PYTHON=$am_cv_pathless_PYTHON
+    fi
+
+
+  if test "$PYTHON" = :; then
+      as_fn_error $? "no suitable Python interpreter found" "$LINENO" 5
+  else
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
+if ${am_cv_python_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
+$as_echo "$am_cv_python_version" >&6; }
+  PYTHON_VERSION=$am_cv_python_version
+
+
+
+  PYTHON_PREFIX='${prefix}'
+
+  PYTHON_EXEC_PREFIX='${exec_prefix}'
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
+if ${am_cv_python_platform+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
+$as_echo "$am_cv_python_platform" >&6; }
+  PYTHON_PLATFORM=$am_cv_python_platform
+
+
+  # Just factor out some code duplication.
+  am_python_setup_sysconfig="\
+import sys
+# Prefer sysconfig over distutils.sysconfig, for better compatibility
+# with python 3.x.  See automake bug#10227.
+try:
+    import sysconfig
+except ImportError:
+    can_use_sysconfig = 0
+else:
+    can_use_sysconfig = 1
+# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs:
+# <https://github.com/pypa/virtualenv/issues/118>
+try:
+    from platform import python_implementation
+    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
+        can_use_sysconfig = 0
+except ImportError:
+    pass"
+
+
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
+if ${am_cv_python_pythondir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$prefix" = xNONE
+     then
+       am_py_prefix=$ac_default_prefix
+     else
+       am_py_prefix=$prefix
+     fi
+     am_cv_python_pythondir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+     case $am_cv_python_pythondir in
+     $am_py_prefix*)
+       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+       ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
+     esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-      test "$ac_cv_lib_lex" != 'none needed' && break
-    done
-    LIBS=$ac_save_LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
+$as_echo "$am_cv_python_pythondir" >&6; }
+  pythondir=$am_cv_python_pythondir
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
-$as_echo "$ac_cv_lib_lex" >&6; }
-  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
-fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
-$as_echo_n "checking whether yytext is a pointer... " >&6; }
-if ${ac_cv_prog_lex_yytext_pointer+:} false; then :
+  pkgpythondir=\${pythondir}/$PACKAGE
+
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
+if ${am_cv_python_pyexecdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent.  Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-ac_save_LIBS=$LIBS
-LIBS="$LEXLIB $ac_save_LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
+  if test "x$exec_prefix" = xNONE
+     then
+       am_py_exec_prefix=$am_py_prefix
+     else
+       am_py_exec_prefix=$exec_prefix
+     fi
+     am_cv_python_pyexecdir=`$PYTHON -c "
+$am_python_setup_sysconfig
+if can_use_sysconfig:
+    sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'})
+else:
+    from distutils import sysconfig
+    sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix')
+sys.stdout.write(sitedir)"`
+     case $am_cv_python_pyexecdir in
+     $am_py_exec_prefix*)
+       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+       ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
+     esac
 
-  #define YYTEXT_POINTER 1
-`cat $LEX_OUTPUT_ROOT.c`
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_prog_lex_yytext_pointer=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_save_LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
+$as_echo "$am_cv_python_pyexecdir" >&6; }
+  pyexecdir=$am_cv_python_pyexecdir
 
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
-$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
-$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
 
-fi
-rm -f conftest.l $LEX_OUTPUT_ROOT.c
+  pkgpyexecdir=\${pyexecdir}/$PACKAGE
+
 
-fi
 
-# Check if bison is available. Bison is not needed for building Kea sources,
-# unless you want to regenerate grammars
-for ac_prog in 'bison -y' byacc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_YACC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_YACC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
   fi
-done
-  done
-IFS=$as_save_IFS
 
-fi
-fi
-YACC=$ac_cv_prog_YACC
-if test -n "$YACC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-$as_echo "$YACC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+
+
+
+# Check whether --with-site-packages was given.
+if test "${with_site_packages+set}" = set; then :
+  withval=$with_site_packages; pythondir=$withval;
+            pkgpythondir=${pythondir}/$PACKAGE_NAME
 fi
 
+  if test "$pythondir" = "yes"; then
+     as_fn_error $? "If enabled, site-packages must be specified explicitly, e.g. --site-packages=/usr/lib/python3/dist-packages" "$LINENO" 5
+  fi
 
-  test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
+  # pkgpythondir needs to be expanded
+  saved_prefix="$prefix"
+  if test "$prefix" = "NONE"; then
+    prefix=$ac_default_prefix
+  fi
+  PKGPYTHONDIR="$pkgpythondir"
+  OLD=
+  while test "x$OLD" != "x$PKGPYTHONDIR"; do
+    OLD="$PKGPYTHONDIR"
+    eval PKGPYTHONDIR="\"$OLD\""
+  done
+  prefix="$saved_prefix"
+  DISTCHECK_KEA_SHELL_CONFIGURE_FLAG="--enable-shell"
+  shell_report="yes, install to $pythondir"
+else
+  PYTHON=no
+fi
 
+# Export to makefiles the info whether we have shell enabled or not
+ if test x$enable_shell != xno; then
+  KEA_SHELL_TRUE=
+  KEA_SHELL_FALSE='#'
+else
+  KEA_SHELL_TRUE='#'
+  KEA_SHELL_FALSE=
+fi
 
-if test "x$enable_generate_parser" != "xno"; then
 
-    if test "x$LEX" == "x"; then
-       as_fn_error $? "Flex is required for enable-generate-parser, but was not found" "$LINENO" 5
-    fi
 
-    if test "x$YACC" == "x"; then
-       as_fn_error $? "Bison is required for enable-generate-parser, but was not found" "$LINENO" 5
-    fi
 
-# Ok, let's check if we have at least 3.0.0 version of the bison. The code used
-# to generate parsers is roughly based on bison 3.0 examples.
-   cat > bisontest.y << EOF
-%require "3.0.0"
-%token X
-%%
-%start Y;
-Y: X;
-EOF
-# Try to compile.
-    $YACC bisontest.y -o bisontest.cc
 
-    if test $? -ne 0 ; then
-        $YACC -V
-        $RM -f bisontest.y bisontest.cc
-        as_fn_error $? "\"Error with $YACC. Possibly incorrect version? Required at least 3.0.0.\"" "$LINENO" 5
-    fi
-    $RM -f bisontest.y bisontest.cc
+# Check whether --with-sphinx was given.
+if test "${with_sphinx+set}" = set; then :
+  withval=$with_sphinx; sphinx_path="$withval"
 fi
 
- if test x$enable_generate_parser != xno; then
-  GENERATE_PARSER_TRUE=
-  GENERATE_PARSER_FALSE='#'
-else
-  GENERATE_PARSER_TRUE='#'
-  GENERATE_PARSER_FALSE=
-fi
 
 
-# Check whether --enable-generate_docs was given.
-if test "${enable_generate_docs+set}" = set; then :
-  enableval=$enable_generate_docs; enable_generate_docs=$enableval
-else
-  enable_generate_docs=no
+# Check whether --with-pdflatex was given.
+if test "${with_pdflatex+set}" = set; then :
+  withval=$with_pdflatex; pdflatex_path="$withval"
 fi
 
+PDFLATEX=no
 
 if test "x$enable_generate_docs" != xno ; then
-
-# Check for xsltproc
-  # Extract the first word of "xsltproc", so it can be a program name with args.
-set dummy xsltproc; ac_word=$2
+  # Check for sphinx-build
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sphinx-build" >&5
+$as_echo_n "checking for sphinx-build... " >&6; }
+  if test -z "$sphinx_path"; then
+     for ac_prog in sphinx-build sphinx-build-3
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XSLTPROC+:} false; then :
+if ${ac_cv_path_SPHINXBUILD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $XSLTPROC in
+  case $SPHINXBUILD in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+  ac_cv_path_SPHINXBUILD="$SPHINXBUILD" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -21057,7 +21284,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_SPHINXBUILD="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -21068,44 +21295,52 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-XSLTPROC=$ac_cv_path_XSLTPROC
-if test -n "$XSLTPROC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
-$as_echo "$XSLTPROC" >&6; }
+SPHINXBUILD=$ac_cv_path_SPHINXBUILD
+if test -n "$SPHINXBUILD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPHINXBUILD" >&5
+$as_echo "$SPHINXBUILD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  if test -z "$XSLTPROC"; then
-    as_fn_error $? "\"xsltproc not found; it is required for --enable-generate-docs\"" "$LINENO" 5
+  test -n "$SPHINXBUILD" && break
+done
+
   else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $XSLTPROC works" >&5
-$as_echo_n "checking if $XSLTPROC works... " >&6; }
-    # run xsltproc to see if works
-    $XSLTPROC --novalid --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
-    if test $? -ne 0 ; then
-      as_fn_error $? "\"Error with $XSLTPROC using release/xsl/current/manpages/docbook.xsl\"" "$LINENO" 5
-    fi
-    $XSLTPROC --novalid --xinclude http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
+     SPHINXBUILD="$sphinx_path"
+  fi
+
+  if test -z "$SPHINXBUILD"; then
+    as_fn_error $? "sphinx-build not found; it is required for --enable-generate-docs, please see http://www.sphinx-doc.org/en/master/usage/installation.html for details" "$LINENO" 5
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SPHINXBUILD" >&5
+$as_echo "$SPHINXBUILD" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $SPHINXBUILD is runnable" >&5
+$as_echo_n "checking whether $SPHINXBUILD is runnable... " >&6; }
+    $SPHINXBUILD --version > conftest.err 2>&1
     if test $? -ne 0 ; then
-      as_fn_error $? "\"Error with $XSLTPROC using release/xsl/current/html/docbook.xsl\"" "$LINENO" 5
+      as_fn_error $? "error with $SPHINXBUILD --version, check conftest.err for details" "$LINENO" 5
     fi
+    rm -f conftest.err
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   fi
 
-  # Extract the first word of "elinks", so it can be a program name with args.
-set dummy elinks; ac_word=$2
+  # Check for pdflatex
+  if test -z "$pdflatex_path"; then
+     # Extract the first word of "pdflatex", so it can be a program name with args.
+set dummy pdflatex; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ELINKS+:} false; then :
+if ${ac_cv_path_PDFLATEX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $ELINKS in
+  case $PDFLATEX in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_ELINKS="$ELINKS" # Let the user override the test with a path.
+  ac_cv_path_PDFLATEX="$PDFLATEX" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -21115,7 +21350,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ELINKS="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_PDFLATEX="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -21126,71 +21361,80 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-ELINKS=$ac_cv_path_ELINKS
-if test -n "$ELINKS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ELINKS" >&5
-$as_echo "$ELINKS" >&6; }
+PDFLATEX=$ac_cv_path_PDFLATEX
+if test -n "$PDFLATEX"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDFLATEX" >&5
+$as_echo "$PDFLATEX" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  if test -z "$ELINKS"; then
-    as_fn_error $? "\"elinks not found; it is required for --enable-generate-docs\"" "$LINENO" 5
+  else
+     PDFLATEX="$pdflatex_path"
   fi
-fi
 
-# Don't fail here if not found, used to generate PDF documentation.
-# Extract the first word of "dblatex", so it can be a program name with args.
-set dummy dblatex; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_DBLATEX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $DBLATEX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_DBLATEX="$DBLATEX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_DBLATEX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
+  if test -z "$PDFLATEX"; then
+    PDFLATEX=no
+  elif test "x$PDFLATEX" == "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pdflatex" >&5
+$as_echo_n "checking for pdflatex... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (disabled)" >&5
+$as_echo "no (disabled)" >&6; }
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PDFLATEX is runnable" >&5
+$as_echo_n "checking whether $PDFLATEX is runnable... " >&6; }
+    $PDFLATEX --version > /dev/null 2>&1
+    if test $? -ne 0 ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - disabled building docs in PDF" >&5
+$as_echo "no - disabled building docs in PDF" >&6; }
+      PDFLATEX=no
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    fi
   fi
-done
-  done
-IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-DBLATEX=$ac_cv_path_DBLATEX
-if test -n "$DBLATEX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBLATEX" >&5
-$as_echo "$DBLATEX" >&6; }
+  if test -n "$SPHINXBUILD" -a "x$PDFLATEX" != "xno"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $SPHINXBUILD and $PDFLATEX work" >&5
+$as_echo_n "checking whether $SPHINXBUILD and $PDFLATEX work... " >&6; }
+    ti=`mktemp -d`
+    to=`mktemp -d`
+    echo 'hello' > $ti/contents.rst
+    sphinx-build -b latex -C $ti $to > /dev/null 2>&1
+    pushd $to > /dev/null 2>&1
+    $PDFLATEX -interaction nonstopmode Python.tex > /dev/null 2>&1
+    popd > /dev/null 2>&1
+    file $to/Python.pdf | grep PDF > /dev/null 2>&1
+    if test $? -ne 0 ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - disabled building docs in PDF" >&5
+$as_echo "no - disabled building docs in PDF" >&6; }
+      PDFLATEX=no
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+    fi
+    rm -rf $ti $to
+  fi
+
+  if test "x$PDFLATEX" != "xno"; then
+    generate_docs_report="html, man and pdf"
+  else
+    generate_docs_report="html, man but no pdf"
+  fi
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+  generate_docs_report="no"
 fi
 
-
- if test "x$DBLATEX" != "x"; then
-  HAVE_DBLATEX_TRUE=
-  HAVE_DBLATEX_FALSE='#'
+ if test "x$PDFLATEX" != "xno"; then
+  HAVE_PDFLATEX_TRUE=
+  HAVE_PDFLATEX_FALSE='#'
 else
-  HAVE_DBLATEX_TRUE='#'
-  HAVE_DBLATEX_FALSE=
+  HAVE_PDFLATEX_TRUE='#'
+  HAVE_PDFLATEX_FALSE=
 fi
 
-
  if test x$enable_generate_docs != xno; then
   GENERATE_DOCS_TRUE=
   GENERATE_DOCS_FALSE='#'
@@ -21467,7 +21711,18 @@ fi
 $as_echo "#define CONFIG_H_WAS_INCLUDED 1" >>confdefs.h
 
 
-ac_config_files="$ac_config_files Makefile compatcheck/Makefile dns++.pc doc/Makefile doc/guide/Makefile doc/version.ent doc/docgen/Makefile ext/Makefile ext/gtest/Makefile ext/coroutine/Makefile kea_version.h m4macros/Makefile src/Makefile src/bin/Makefile src/bin/admin/Makefile src/bin/admin/kea-admin src/bin/admin/tests/Makefile src/bin/admin/tests/cql_tests.sh src/bin/admin/tests/data/Makefile src/bin/admin/tests/memfile_tests.sh src/bin/admin/tests/mysql_tests.sh src/bin/admin/tests/pgsql_tests.sh src/bin/agent/Makefile src/bin/agent/tests/Makefile src/bin/agent/tests/ca_process_tests.sh src/bin/agent/tests/test_data_files_config.h src/bin/agent/tests/test_libraries.h src/bin/d2/Makefile src/bin/d2/tests/Makefile src/bin/d2/tests/d2_process_tests.sh src/bin/d2/tests/test_data_files_config.h src/bin/dhcp4/Makefile src/bin/dhcp4/tests/Makefile src/bin/dhcp4/tests/dhcp4_process_tests.sh src/bin/dhcp4/tests/marker_file.h src/bin/dhcp4/tests/test_data_files_config.h src/bin/dhcp4/tests/test_libraries.h src/bin/dhcp6/Makefile src/bin/dhcp6/tests/Makefile src/bin/dhcp6/tests/dhcp6_process_tests.sh src/bin/dhcp6/tests/marker_file.h src/bin/dhcp6/tests/test_data_files_config.h src/bin/dhcp6/tests/test_libraries.h src/bin/keactrl/Makefile src/bin/keactrl/keactrl src/bin/keactrl/keactrl.conf src/bin/keactrl/tests/Makefile src/bin/keactrl/tests/keactrl_tests.sh src/bin/lfc/Makefile src/bin/lfc/tests/Makefile src/bin/netconf/Makefile src/bin/netconf/tests/Makefile src/bin/netconf/tests/shtests/Makefile src/bin/netconf/tests/shtests/netconf_tests.sh src/bin/netconf/tests/test_data_files_config.h src/bin/netconf/tests/test_libraries.h src/bin/perfdhcp/Makefile src/bin/perfdhcp/tests/Makefile src/bin/perfdhcp/tests/testdata/Makefile src/bin/shell/Makefile src/bin/shell/kea-shell src/bin/shell/tests/Makefile src/bin/shell/tests/shell_process_tests.sh src/bin/shell/tests/shell_unittest.py src/hooks/Makefile src/hooks/dhcp/Makefile src/hooks/dhcp/high_availability/Makefile src/hooks/dhcp/high_availability/tests/Makefile src/hooks/dhcp/lease_cmds/Makefile src/hooks/dhcp/lease_cmds/tests/Makefile src/hooks/dhcp/user_chk/Makefile src/hooks/dhcp/user_chk/tests/Makefile src/hooks/dhcp/user_chk/tests/test_data_files_config.h src/hooks/dhcp/stat_cmds/Makefile src/hooks/dhcp/stat_cmds/tests/Makefile src/lib/Makefile src/lib/asiodns/Makefile src/lib/asiodns/tests/Makefile src/lib/asiolink/Makefile src/lib/asiolink/testutils/Makefile src/lib/asiolink/tests/Makefile src/lib/cc/Makefile src/lib/cc/tests/Makefile src/lib/cfgrpt/Makefile src/lib/cfgrpt/tests/Makefile src/lib/config/Makefile src/lib/config/tests/Makefile src/lib/config/tests/data_def_unittests_config.h src/lib/config/tests/testdata/Makefile src/lib/config_backend/Makefile src/lib/config_backend/tests/Makefile src/lib/cryptolink/Makefile src/lib/cryptolink/tests/Makefile src/lib/database/Makefile src/lib/database/tests/Makefile src/lib/database/testutils/Makefile src/lib/dhcp/Makefile src/lib/dhcp/tests/Makefile src/lib/dhcp_ddns/Makefile src/lib/dhcp_ddns/tests/Makefile src/lib/dhcpsrv/Makefile src/lib/dhcpsrv/benchmarks/Makefile src/lib/dhcpsrv/tests/Makefile src/lib/dhcpsrv/tests/test_libraries.h src/lib/dhcpsrv/testutils/Makefile src/lib/dns/Makefile src/lib/dns/gen-rdatacode.py src/lib/dns/tests/Makefile src/lib/dns/tests/testdata/Makefile src/lib/eval/Makefile src/lib/eval/tests/Makefile src/lib/exceptions/Makefile src/lib/exceptions/tests/Makefile src/lib/hooks/Makefile src/lib/hooks/tests/Makefile src/lib/hooks/tests/marker_file.h src/lib/hooks/tests/test_libraries.h src/lib/http/Makefile src/lib/http/tests/Makefile src/lib/log/Makefile src/lib/log/compiler/Makefile src/lib/log/interprocess/Makefile src/lib/log/interprocess/tests/Makefile src/lib/log/tests/Makefile src/lib/log/tests/buffer_logger_test.sh src/lib/log/tests/console_test.sh src/lib/log/tests/destination_test.sh src/lib/log/tests/init_logger_test.sh src/lib/log/tests/local_file_test.sh src/lib/log/tests/logger_lock_test.sh src/lib/log/tests/severity_test.sh src/lib/log/tests/tempdir.h src/lib/mysql/Makefile src/lib/mysql/testutils/Makefile src/lib/mysql/tests/Makefile src/lib/pgsql/Makefile src/lib/pgsql/tests/Makefile src/lib/pgsql/testutils/Makefile src/lib/cql/Makefile src/lib/cql/tests/Makefile src/lib/cql/testutils/Makefile src/lib/process/Makefile src/lib/process/tests/Makefile src/lib/process/testutils/Makefile src/lib/stats/Makefile src/lib/stats/tests/Makefile src/lib/testutils/Makefile src/lib/testutils/dhcp_test_lib.sh src/lib/util/Makefile src/lib/util/io/Makefile src/lib/util/python/Makefile src/lib/util/python/gen_wiredata.py src/lib/util/tests/Makefile src/lib/util/tests/process_spawn_app.sh src/lib/util/threads/Makefile src/lib/util/threads/tests/Makefile src/lib/util/unittests/Makefile src/lib/yang/Makefile src/lib/yang/pretests/Makefile src/lib/yang/tests/Makefile src/lib/yang/testutils/Makefile src/share/Makefile src/share/database/Makefile src/share/database/scripts/Makefile src/share/database/scripts/cql/Makefile src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh src/share/database/scripts/mysql/Makefile src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh src/share/database/scripts/pgsql/Makefile src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh src/share/yang/Makefile src/share/yang/modules/Makefile tools/Makefile tools/path_replacer.sh"
+# Autoconf 2.70 has runstatedir but is not yet released.
+
+if test "x$runstatedir" = "x"; then
+    runstatedir="$localstatedir/run"
+fi
+
+# Expand runstatedir to remove ${localstatedir} from it
+if (echo ${runstatedir} | grep -q localstatedir); then
+    runstatedir="$(eval echo ${runstatedir})"
+fi
+
+ac_config_files="$ac_config_files Makefile doc/Makefile doc/sphinx/Makefile doc/devel/Makefile ext/Makefile ext/gtest/Makefile ext/coroutine/Makefile kea_version.h m4macros/Makefile src/Makefile src/bin/Makefile src/bin/admin/Makefile src/bin/admin/kea-admin src/bin/admin/tests/Makefile src/bin/admin/tests/cql_tests.sh src/bin/admin/tests/data/Makefile src/bin/admin/tests/memfile_tests.sh src/bin/admin/tests/mysql_tests.sh src/bin/admin/tests/pgsql_tests.sh src/bin/agent/Makefile src/bin/agent/tests/Makefile src/bin/agent/tests/ca_process_tests.sh src/bin/agent/tests/test_data_files_config.h src/bin/agent/tests/test_libraries.h src/bin/d2/Makefile src/bin/d2/tests/Makefile src/bin/d2/tests/d2_process_tests.sh src/bin/d2/tests/test_data_files_config.h src/bin/dhcp4/Makefile src/bin/dhcp4/tests/Makefile src/bin/dhcp4/tests/dhcp4_process_tests.sh src/bin/dhcp4/tests/marker_file.h src/bin/dhcp4/tests/test_data_files_config.h src/bin/dhcp4/tests/test_libraries.h src/bin/dhcp6/Makefile src/bin/dhcp6/tests/Makefile src/bin/dhcp6/tests/dhcp6_process_tests.sh src/bin/dhcp6/tests/marker_file.h src/bin/dhcp6/tests/test_data_files_config.h src/bin/dhcp6/tests/test_libraries.h src/bin/keactrl/Makefile src/bin/keactrl/keactrl src/bin/keactrl/keactrl.conf src/bin/keactrl/tests/Makefile src/bin/keactrl/tests/keactrl_tests.sh src/bin/lfc/Makefile src/bin/lfc/tests/Makefile src/bin/netconf/Makefile src/bin/netconf/tests/Makefile src/bin/netconf/tests/shtests/Makefile src/bin/netconf/tests/shtests/netconf_tests.sh src/bin/netconf/tests/test_data_files_config.h src/bin/netconf/tests/test_libraries.h src/bin/perfdhcp/Makefile src/bin/perfdhcp/tests/Makefile src/bin/perfdhcp/tests/testdata/Makefile src/bin/shell/Makefile src/bin/shell/kea-shell src/bin/shell/tests/Makefile src/bin/shell/tests/shell_process_tests.sh src/bin/shell/tests/shell_unittest.py src/hooks/Makefile src/hooks/dhcp/Makefile src/hooks/dhcp/high_availability/Makefile src/hooks/dhcp/high_availability/tests/Makefile src/hooks/dhcp/lease_cmds/Makefile src/hooks/dhcp/lease_cmds/tests/Makefile src/hooks/dhcp/mysql_cb/Makefile src/hooks/dhcp/mysql_cb/tests/Makefile src/hooks/dhcp/user_chk/Makefile src/hooks/dhcp/user_chk/tests/Makefile src/hooks/dhcp/user_chk/tests/test_data_files_config.h src/hooks/dhcp/stat_cmds/Makefile src/hooks/dhcp/stat_cmds/tests/Makefile src/lib/Makefile src/lib/asiodns/Makefile src/lib/asiodns/tests/Makefile src/lib/asiolink/Makefile src/lib/asiolink/testutils/Makefile src/lib/asiolink/tests/Makefile src/lib/cc/Makefile src/lib/cc/tests/Makefile src/lib/cfgrpt/Makefile src/lib/cfgrpt/tests/Makefile src/lib/config/Makefile src/lib/config/tests/Makefile src/lib/config/tests/data_def_unittests_config.h src/lib/config/tests/testdata/Makefile src/lib/config_backend/Makefile src/lib/config_backend/tests/Makefile src/lib/cryptolink/Makefile src/lib/cryptolink/tests/Makefile src/lib/database/Makefile src/lib/database/tests/Makefile src/lib/database/testutils/Makefile src/lib/dhcp/Makefile src/lib/dhcp/tests/Makefile src/lib/dhcp_ddns/Makefile src/lib/dhcp_ddns/tests/Makefile src/lib/dhcpsrv/Makefile src/lib/dhcpsrv/benchmarks/Makefile src/lib/dhcpsrv/tests/Makefile src/lib/dhcpsrv/tests/test_libraries.h src/lib/dhcpsrv/testutils/Makefile src/lib/dns/Makefile src/lib/dns/gen-rdatacode.py src/lib/dns/tests/Makefile src/lib/dns/tests/testdata/Makefile src/lib/eval/Makefile src/lib/eval/tests/Makefile src/lib/exceptions/Makefile src/lib/exceptions/tests/Makefile src/lib/hooks/Makefile src/lib/hooks/tests/Makefile src/lib/hooks/tests/marker_file.h src/lib/hooks/tests/test_libraries.h src/lib/http/Makefile src/lib/http/tests/Makefile src/lib/log/Makefile src/lib/log/compiler/Makefile src/lib/log/interprocess/Makefile src/lib/log/interprocess/tests/Makefile src/lib/log/tests/Makefile src/lib/log/tests/buffer_logger_test.sh src/lib/log/tests/console_test.sh src/lib/log/tests/destination_test.sh src/lib/log/tests/init_logger_test.sh src/lib/log/tests/local_file_test.sh src/lib/log/tests/logger_lock_test.sh src/lib/log/tests/severity_test.sh src/lib/log/tests/tempdir.h src/lib/mysql/Makefile src/lib/mysql/testutils/Makefile src/lib/mysql/tests/Makefile src/lib/pgsql/Makefile src/lib/pgsql/tests/Makefile src/lib/pgsql/testutils/Makefile src/lib/cql/Makefile src/lib/cql/tests/Makefile src/lib/cql/testutils/Makefile src/lib/process/Makefile src/lib/process/tests/Makefile src/lib/process/testutils/Makefile src/lib/stats/Makefile src/lib/stats/tests/Makefile src/lib/testutils/Makefile src/lib/testutils/dhcp_test_lib.sh src/lib/util/Makefile src/lib/util/io/Makefile src/lib/util/python/Makefile src/lib/util/python/gen_wiredata.py src/lib/util/tests/Makefile src/lib/util/tests/process_spawn_app.sh src/lib/util/threads/Makefile src/lib/util/threads/tests/Makefile src/lib/util/unittests/Makefile src/lib/yang/Makefile src/lib/yang/pretests/Makefile src/lib/yang/tests/Makefile src/lib/yang/testutils/Makefile src/share/Makefile src/share/database/Makefile src/share/database/scripts/Makefile src/share/database/scripts/cql/Makefile src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh src/share/database/scripts/cql/wipe_data.sh src/share/database/scripts/mysql/Makefile src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh src/share/database/scripts/mysql/upgrade_3.0_to_4.0.sh src/share/database/scripts/mysql/upgrade_4.0_to_4.1.sh src/share/database/scripts/mysql/upgrade_4.1_to_5.0.sh src/share/database/scripts/mysql/upgrade_5.0_to_5.1.sh src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh src/share/database/scripts/mysql/wipe_data.sh src/share/database/scripts/pgsql/Makefile src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh src/share/database/scripts/pgsql/upgrade_3.0_to_3.1.sh src/share/database/scripts/pgsql/upgrade_3.1_to_3.2.sh src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh src/share/database/scripts/pgsql/wipe_data.sh src/share/yang/Makefile src/share/yang/modules/Makefile tools/Makefile tools/path_replacer.sh"
 
 
 ac_config_commands="$ac_config_commands permissions"
@@ -21606,10 +21861,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
-  as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${DEBUG_ENABLED_TRUE}" && test -z "${DEBUG_ENABLED_FALSE}"; then
   as_fn_error $? "conditional \"DEBUG_ENABLED\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21630,8 +21881,8 @@ if test -z "${USE_STATIC_LINK_TRUE}" && test -z "${USE_STATIC_LINK_FALSE}"; then
   as_fn_error $? "conditional \"USE_STATIC_LINK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${KEA_SHELL_TRUE}" && test -z "${KEA_SHELL_FALSE}"; then
-  as_fn_error $? "conditional \"KEA_SHELL\" was never defined.
+if test -z "${PERFDHCP_TRUE}" && test -z "${PERFDHCP_FALSE}"; then
+  as_fn_error $? "conditional \"PERFDHCP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then
@@ -21710,12 +21961,20 @@ if test -z "${HAVE_BENCHMARK_SOURCE_TRUE}" && test -z "${HAVE_BENCHMARK_SOURCE_F
   as_fn_error $? "conditional \"HAVE_BENCHMARK_SOURCE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GENERATE_MESSAGES_TRUE}" && test -z "${GENERATE_MESSAGES_FALSE}"; then
+  as_fn_error $? "conditional \"GENERATE_MESSAGES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${GENERATE_PARSER_TRUE}" && test -z "${GENERATE_PARSER_FALSE}"; then
   as_fn_error $? "conditional \"GENERATE_PARSER\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${HAVE_DBLATEX_TRUE}" && test -z "${HAVE_DBLATEX_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_DBLATEX\" was never defined.
+if test -z "${KEA_SHELL_TRUE}" && test -z "${KEA_SHELL_FALSE}"; then
+  as_fn_error $? "conditional \"KEA_SHELL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${HAVE_PDFLATEX_TRUE}" && test -z "${HAVE_PDFLATEX_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_PDFLATEX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GENERATE_DOCS_TRUE}" && test -z "${GENERATE_DOCS_FALSE}"; then
@@ -22143,7 +22402,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by kea $as_me 1.5.0, which was
+This file was extended by kea $as_me 1.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -22209,7 +22468,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-kea config.status 1.5.0
+kea config.status 1.6.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -22723,12 +22982,9 @@ do
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "compatcheck/Makefile") CONFIG_FILES="$CONFIG_FILES compatcheck/Makefile" ;;
-    "dns++.pc") CONFIG_FILES="$CONFIG_FILES dns++.pc" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-    "doc/guide/Makefile") CONFIG_FILES="$CONFIG_FILES doc/guide/Makefile" ;;
-    "doc/version.ent") CONFIG_FILES="$CONFIG_FILES doc/version.ent" ;;
-    "doc/docgen/Makefile") CONFIG_FILES="$CONFIG_FILES doc/docgen/Makefile" ;;
+    "doc/sphinx/Makefile") CONFIG_FILES="$CONFIG_FILES doc/sphinx/Makefile" ;;
+    "doc/devel/Makefile") CONFIG_FILES="$CONFIG_FILES doc/devel/Makefile" ;;
     "ext/Makefile") CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;;
     "ext/gtest/Makefile") CONFIG_FILES="$CONFIG_FILES ext/gtest/Makefile" ;;
     "ext/coroutine/Makefile") CONFIG_FILES="$CONFIG_FILES ext/coroutine/Makefile" ;;
@@ -22792,6 +23048,8 @@ do
     "src/hooks/dhcp/high_availability/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/high_availability/tests/Makefile" ;;
     "src/hooks/dhcp/lease_cmds/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/lease_cmds/Makefile" ;;
     "src/hooks/dhcp/lease_cmds/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/lease_cmds/tests/Makefile" ;;
+    "src/hooks/dhcp/mysql_cb/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/mysql_cb/Makefile" ;;
+    "src/hooks/dhcp/mysql_cb/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/mysql_cb/tests/Makefile" ;;
     "src/hooks/dhcp/user_chk/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/user_chk/Makefile" ;;
     "src/hooks/dhcp/user_chk/tests/Makefile") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/user_chk/tests/Makefile" ;;
     "src/hooks/dhcp/user_chk/tests/test_data_files_config.h") CONFIG_FILES="$CONFIG_FILES src/hooks/dhcp/user_chk/tests/test_data_files_config.h" ;;
@@ -22889,6 +23147,8 @@ do
     "src/share/database/scripts/cql/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/cql/Makefile" ;;
     "src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh" ;;
     "src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh" ;;
+    "src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh" ;;
+    "src/share/database/scripts/cql/wipe_data.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/cql/wipe_data.sh" ;;
     "src/share/database/scripts/mysql/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/Makefile" ;;
     "src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_1.0_to_2.0.sh" ;;
     "src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_2.0_to_3.0.sh" ;;
@@ -22899,6 +23159,10 @@ do
     "src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_5.1_to_5.2.sh" ;;
     "src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_5.2_to_6.0.sh" ;;
     "src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_6.0_to_7.0.sh" ;;
+    "src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_7.0_to_8.0.sh" ;;
+    "src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_8.0_to_8.1.sh" ;;
+    "src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/upgrade_8.1_to_8.2.sh" ;;
+    "src/share/database/scripts/mysql/wipe_data.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/mysql/wipe_data.sh" ;;
     "src/share/database/scripts/pgsql/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/Makefile" ;;
     "src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/upgrade_1.0_to_2.0.sh" ;;
     "src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/upgrade_2.0_to_3.0.sh" ;;
@@ -22907,6 +23171,8 @@ do
     "src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/upgrade_3.2_to_3.3.sh" ;;
     "src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/upgrade_3.3_to_4.0.sh" ;;
     "src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/upgrade_4.0_to_5.0.sh" ;;
+    "src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/upgrade_5.0_to_5.1.sh" ;;
+    "src/share/database/scripts/pgsql/wipe_data.sh") CONFIG_FILES="$CONFIG_FILES src/share/database/scripts/pgsql/wipe_data.sh" ;;
     "src/share/yang/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/yang/Makefile" ;;
     "src/share/yang/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/share/yang/modules/Makefile" ;;
     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
@@ -23615,7 +23881,6 @@ $as_echo X"$file" |
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
@@ -24376,6 +24641,22 @@ if test "$KEA_SRCID" != ""; then
    EXTENDED_VERSION="${EXTENDED_VERSION} ($KEA_SRCID)"
 fi
 
+# By default the following variables are defined:
+# - prefix = /usr/local
+# - exec_prefix = ${prefix}
+# - libdir = ${exec_prefix}/lib
+# The exec_prefix and libdir variables contain unexpanded,literal ${prefix}.
+# This is done on purpose. The idea is to be able to make this expansion
+# late, so use can do:
+# make install prefix=/my/own/prefix
+#
+# Now, we want to print those directories in the config.report, but we
+# don't want to modify the actual variables. So we need to expand them.
+# Since libdir contains $exec_prefix and exec_prefix contains $prefix, then
+# to get the real value, we need to expand it twice.
+libdir_real="$(eval echo ${libdir})"
+libdir_real="$(eval echo ${libdir_real})"
+
 cat > config.report << END
 
        Kea source configure results:
@@ -24387,7 +24668,8 @@ Package:
   Extended version:  ${EXTENDED_VERSION}
   OS Family:         ${OS_TYPE}
 
-  Hooks directory:   ${prefix}/lib/hooks
+  Prefix:            ${prefix}
+  Hooks directory:   ${libdir_real}/kea/hooks
 END
 if test "$PREMIUM" != ""; then
 cat >> config.report << END
@@ -24583,14 +24865,17 @@ fi
 cat >> config.report << END
 
 Developer:
-  Enable Debugging:       $debug_enabled
-  Google Tests:           $enable_gtest
-  Valgrind:               $found_valgrind
-  C++ Code Coverage:      $USE_LCOV
-  Logger checks:          $enable_logger_checks
-  Generate Documentation: $enable_generate_docs
-  Parser Generation:      $enable_generate_parser
-  Kea-shell:              $enable_shell
+  Enable Debugging:          $debug_enabled
+  Google Tests:              $enable_gtest
+  Google Benchmark:          $enable_benchmark
+  Valgrind:                  $found_valgrind
+  C++ Code Coverage:         $USE_LCOV
+  Logger checks:             $enable_logger_checks
+  Generate Documentation:    $generate_docs_report
+  Generate Parser:           $enable_generate_parser
+  Generate Messages Files:   $enable_generate_messages
+  Perfdhcp:                  $enable_perfdhcp
+  Kea-shell:                 $shell_report
 
 END
 
diff --git a/configure.ac b/configure.ac
old mode 100644
new mode 100755
index c880b77..48a85d1
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ([2.69])
 # For GIT versions, this is x.y.z-git, where x.y.z denotes the software
 # version that was used as a base + changes that were made later, but
 # are not released yet.
-AC_INIT(kea,1.5.0, [e-mail])
+AC_INIT(kea,1.6.1, [e-mail])
 AC_CONFIG_SRCDIR(README)
 
 # serial-tests is not available in automake version before 1.13, so
@@ -64,21 +64,6 @@ if test "$sep" = "__NONE__"; then
 fi
 AC_SUBST(SEP)
 
-# If cross compiling assume the message compiler executable was
-# magically already in place...
-if test "$cross_compiling" = "yes"; then
-        AC_MSG_CHECKING("build (vs. host) compiled message compiler")
-	if test -x "${srcdir}/src/lib/log/compiler/message"; then
-		AC_MSG_RESULT(yes)
-	else
-		AC_MSG_RESULT(no)
-		AC_MSG_WARN("you must install a message compiler in:")
-		AC_MSG_WARN("    ${srcdir}/src/lib/log/compiler/message")
-		AC_MSG_WARN("compiled for build ($build).")
-	fi
-fi
-AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = "yes"])
-
 # pkg-config can be required.
 AC_PATH_PROG([PKG_CONFIG], [pkg-config])
 
@@ -436,44 +421,19 @@ case "$host" in
         ;;
 esac
 
-# Kea-shell is written in python. It can work with python 2.7 or any 3.x.
-# It may likely work with earlier versions, but 2.7 was the oldest one we tested
-# it with. We require python only if kea-shell was enabled. It is disabled
-# by default to not introduce hard dependency on python.
-AC_ARG_ENABLE(shell, [AC_HELP_STRING([--enable-shell],
-  [enable kea-shell, a text management client for Control Agent [default=no]])],
-  enable_shell=$enableval, enable_shell=no)
+# Made perfdhcp optional.
+AC_ARG_ENABLE(perfdhcp, [AC_HELP_STRING([--enable-perfdhcp],
+  [enable perfdhcp, a DHCP benchmarking tool [default=no]])],
+  enable_perfdhcp=$enableval, enable_perfdhcp=no)
 
-DISTCHECK_KEA_SHELL_CONFIGURE_FLAG=
-PKGPYTHONDIR=
-m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
- [python3 python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 dnl
-  python3.3 python3.2 python3.1 python3.0 python python2 python2.7])
-if test "x$enable_shell" != xno ; then
-# If kea-shell is enabled, we really need python. 2.7 or anything newer will do.
-# We try to find 3.x first. If not found, we can do with 2.7.
-  AM_PATH_PYTHON([2.7])
-  # pkgpythondir needs to be expanded
-  saved_prefix="$prefix"
-  if test "$prefix" = "NONE"; then
-    prefix=$ac_default_prefix
-  fi
-  PKGPYTHONDIR="$pkgpythondir"
-  OLD=
-  while test "x$OLD" != "x$PKGPYTHONDIR"; do
-    OLD="$PKGPYTHONDIR"
-    eval PKGPYTHONDIR="\"$OLD\""
-  done
-  prefix="$saved_prefix"
-  DISTCHECK_KEA_SHELL_CONFIGURE_FLAG="--enable-shell"
-else
-  PYTHON=no
+DISTCHECK_PERFDHCP_CONFIGURE_FLAG=
+if test "x$enable_perfdhcp" != xno ; then
+  DISTCHECK_PERFDHCP_CONFIGURE_FLAG="--enable-perfdhcp"
 fi
 
-# Export to makefiles the info whether we have shell enabled or not
-AM_CONDITIONAL(KEA_SHELL, test x$enable_shell != xno)
-AC_SUBST(DISTCHECK_KEA_SHELL_CONFIGURE_FLAG)
-AC_SUBST(PKGPYTHONDIR)
+# Export to makefiles the info whether we have perfdhcp enabled or not
+AM_CONDITIONAL(PERFDHCP, test x$enable_perfdhcp != xno)
+AC_SUBST(DISTCHECK_PERFDHCP_CONFIGURE_FLAG)
 
 # produce PIC unless we disable shared libraries. need this for python bindings.
 if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
@@ -606,8 +566,11 @@ AC_ARG_WITH([gtest],
                             [specify a path to gtest header files (PATH/include) and library (PATH/lib)])],
         [gtest_path="$withval"; enable_gtest="yes"], [gtest_path="no"])
 
-AC_ARG_WITH(lcov,
-[  --with-lcov[=PROGRAM]         enable gtest and coverage target using the specified lcov], lcov="$withval", lcov="no")
+AC_ARG_WITH([lcov],
+            [AS_HELP_STRING([--with-lcov=PROGRAM],
+                            [enable gtest and coverage target using the specified lcov])],
+                            [lcov="$withval"],
+                            [lcov="no"])
 
 USE_LCOV="no"
 if test "$lcov" != "no"; then
@@ -681,6 +644,7 @@ if test "${deprec_msg}" = "yes" ; then
 fi
 
 if test "${mysql_config}" = "yes" ; then
+    MYSQL_CONFIG="/usr/bin/mysql_config"
     for d in $defaultdirs
     do
         if test -f $d/bin/mysql_config; then
@@ -694,11 +658,12 @@ fi
 
 if test "$MYSQL_CONFIG" != "" ; then
     if test -d "$MYSQL_CONFIG" -o ! -x "$MYSQL_CONFIG" ; then
-        AC_MSG_ERROR([--with-mysql should point to a mysql_config program])
+        AC_MSG_ERROR([MySQL dependencies cannot be found. Please install MySQL libraries or point --with-mysql to mysql_config program if it is located in non-default directory, eg. --with-mysql=/opt/mysql/bin/mysql_config.])
     fi
 
     MYSQL_CPPFLAGS=`$MYSQL_CONFIG --cflags`
     MYSQL_LIBS=`$MYSQL_CONFIG --libs`
+    MYSQL_LIBS="$MYSQL_LIBS $CRYPTO_LIBS"
     MYSQL_VERSION=`$MYSQL_CONFIG --version`
 
     AC_SUBST(MYSQL_CPPFLAGS)
@@ -712,20 +677,30 @@ if test "$MYSQL_CONFIG" != "" ; then
     LIBS="$MYSQL_LIBS $LIBS"