GitLab

The merge logic was simplified a bit and the commentary was improved.

 - GenericLeaseMgrTest class moved to a separate file
 - @todo added for disabled tests in memfile (with explanations)
 - Added several comments

Also, a couple of trivial changes, mostly documentary.

The merge function defined in isc.cc.data module did not correctly
do deep merges, so map sub elements were simply be replaced rather
than merged.

Got rid of nodistdir and used noinst_ instead of nodist_
for dhcp hooks tests

Also use -rpath /nowhere as a hack to trigger libtool to not create a
convenience archive, resulting in shared modules.

This was noticed when trying to do distcheck build on non-Linux.
(Our non-Linux automated builder disappeared.)
I tested this and okayed by muks on jabber.

using reorder_message_file.py tool

Solaris defines FIONREAD, used in unit test is dhcp_ddns/watch_socket_unittests.cc in sys/filio.h.  Added header check for this file to configure.ac and use
of HAVE_SYS_FILIO_H in the unit test source.

data::merge function is intended to merge to map elements together.
However, if those maps contain elements which are themselves maps they
are not merged.  The function uses recursion to merge map sub-elements.