[master] Merged branch 'trac2957'. This adds configuration parsing

support for DHCP-DDNS.

diff --cc configure.ac
Simple merge

diff --cc src/bin/d2/Makefile.am
index 6f889dbe371ee923e94235639536a166c1fb9b64,fe1f2a8a1d4161ddce695261cb843f80a2dc2058..aa87354d9da9a14353c6defc68c7df47ccb29f32
--- 1/src/bin/d2/Makefile.am
--- 2/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@@ -48,12 -48,13 +48,14 @@@ pkglibexec_PROGRAMS = b10-dhcp-ddn
  
  b10_dhcp_ddns_SOURCES  = main.cc
  b10_dhcp_ddns_SOURCES += d2_log.cc d2_log.h
--b10_dhcp_ddns_SOURCES += d_process.h
  b10_dhcp_ddns_SOURCES += d2_process.cc d2_process.h
  b10_dhcp_ddns_SOURCES += d_controller.cc d_controller.h
  b10_dhcp_ddns_SOURCES += d2_controller.cc d2_controller.h
+ b10_dhcp_ddns_SOURCES += d_cfg_mgr.cc d_cfg_mgr.h
+ b10_dhcp_ddns_SOURCES += d2_config.cc d2_config.h
+ b10_dhcp_ddns_SOURCES += d2_cfg_mgr.cc d2_cfg_mgr.h
 +b10_dhcp_ddns_SOURCES += d2_update_message.cc d2_update_message.h
 +b10_dhcp_ddns_SOURCES += d2_zone.cc d2_zone.h
  
  nodist_b10_dhcp_ddns_SOURCES = d2_messages.h d2_messages.cc
  EXTRA_DIST += d2_messages.mes
@@@ -63,7 -64,7 +65,8 @@@ b10_dhcp_ddns_LDADD += $(top_builddir)/
  b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
  b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
  b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+ b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la 
 +b10_dhcp_ddns_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
  
  b10_dhcp_ddnsdir = $(pkgdatadir)
  b10_dhcp_ddns_DATA = dhcp-ddns.spec

diff --cc src/bin/d2/tests/Makefile.am
index a7b37ce372c394770087e49a6c750acd53163baf,593292ba41b691241c865263ea0043949e87656e..14518d5291bf67f4c217901c0e6b78e4e79882af
--- 1/src/bin/d2/tests/Makefile.am
--- 2/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@@ -56,15 -56,16 +56,20 @@@ d2_unittests_SOURCES += ../d_process.
  d2_unittests_SOURCES += ../d_controller.cc ../d2_controller.h
  d2_unittests_SOURCES += ../d2_process.cc ../d2_process.h
  d2_unittests_SOURCES += ../d2_controller.cc ../d2_controller.h
+ d2_unittests_SOURCES += ../d_cfg_mgr.cc ../d_cfg_mgr.h
+ d2_unittests_SOURCES += ../d2_config.cc ../d2_config.h
+ d2_unittests_SOURCES += ../d2_cfg_mgr.cc ../d2_cfg_mgr.h
 +d2_unittests_SOURCES += ../d2_update_message.cc ../d2_update_message.h
 +d2_unittests_SOURCES += ../d2_zone.cc ../d2_zone.h
  d2_unittests_SOURCES += d_test_stubs.cc d_test_stubs.h
  d2_unittests_SOURCES += d2_unittests.cc
  d2_unittests_SOURCES += d2_process_unittests.cc
  d2_unittests_SOURCES += d_controller_unittests.cc
  d2_unittests_SOURCES += d2_controller_unittests.cc
+ d2_unittests_SOURCES += d_cfg_mgr_unittests.cc
+ d2_unittests_SOURCES += d2_cfg_mgr_unittests.cc
 +d2_unittests_SOURCES += d2_update_message_unittests.cc
 +d2_unittests_SOURCES += d2_zone_unittests.cc
  nodist_d2_unittests_SOURCES = ../d2_messages.h ../d2_messages.cc
  
  d2_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
@@@ -75,7 -76,7 +80,8 @@@ d2_unittests_LDADD += $(top_builddir)/s
  d2_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/cc/libb10-cc.la
  d2_unittests_LDADD += $(top_builddir)/src/lib/config/libb10-cfgclient.la
+ d2_unittests_LDADD += $(top_builddir)/src/lib/dhcpsrv/libb10-dhcpsrv.la
 +d2_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
  endif
  
  noinst_PROGRAMS = $(TESTS)