[3983] defaults.h moved to src (after Marcin's review)

src/Makefile.am

@@ -3,4 +3,5 @@ SUBDIRS = lib bin hooks
 EXTRA_DIST = \
 	cppcheck-suppress.lst		\
 	valgrind-suppressions		\
-	valgrind-suppressions.revisit
+	valgrind-suppressions.revisit   \
+        defaults.h

src/bin/dhcp4/Makefile.am

@@ -2,6 +2,7 @@ SUBDIRS = . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 if HAVE_MYSQL
 AM_CPPFLAGS += $(MYSQL_CPPFLAGS)

src/bin/dhcp4/json_config_parser.cc

@@ -21,7 +21,6 @@
 #include <dhcpsrv/cfg_option.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcp4/json_config_parser.h>
-#include <dhcpsrv/defaults.h>
 #include <dhcpsrv/option_space_container.h>
 #include <dhcpsrv/parsers/dbaccess_parser.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
@@ -31,6 +30,7 @@
 #include <config/command_mgr.h>
 #include <util/encode/hex.h>
 #include <util/strutil.h>
+#include <defaults.h>
 
 #include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>

src/bin/dhcp4/tests/Makefile.am

@@ -17,6 +17,7 @@ check-local:
 	done
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
 AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/cc

src/bin/dhcp4/tests/config_parser_unittest.cc

@@ -32,8 +32,8 @@
 #include <dhcpsrv/cfg_hosts.h>
 #include <dhcpsrv/cfg_subnets4.h>
 #include <dhcpsrv/testutils/config_result_check.h>
-#include <dhcpsrv/defaults.h>
 #include <hooks/hooks_manager.h>
+#include <defaults.h>
 
 #include "marker_file.h"
 #include "test_libraries.h"

src/bin/dhcp6/Makefile.am

@@ -3,6 +3,7 @@ SUBDIRS = . tests
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin -I$(top_builddir)/src/bin
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/cc -I$(top_builddir)/src/lib/cc
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 if HAVE_MYSQL
 AM_CPPFLAGS += $(MYSQL_CPPFLAGS)

src/bin/dhcp6/json_config_parser.cc

@@ -27,7 +27,6 @@
 #include <dhcpsrv/pool.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/triplet.h>
-#include <dhcpsrv/defaults.h>
 #include <dhcpsrv/parsers/dbaccess_parser.h>
 #include <dhcpsrv/parsers/dhcp_config_parser.h>
 #include <dhcpsrv/parsers/dhcp_parsers.h>
@@ -37,6 +36,7 @@
 #include <log/logger_support.h>
 #include <util/encode/hex.h>
 #include <util/strutil.h>
+#include <defaults.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>

src/bin/dhcp6/tests/Makefile.am

@@ -20,6 +20,7 @@ check-local:
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/bin # for generated spec_config.h header
 AM_CPPFLAGS += -I$(top_srcdir)/src/bin
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src
 AM_CPPFLAGS += -DTOP_BUILDDIR="\"$(top_builddir)\""
 AM_CPPFLAGS += $(BOOST_INCLUDES)
 AM_CPPFLAGS += -DTEST_DATA_DIR=\"$(abs_top_srcdir)/src/lib/testutils/testdata\"

src/bin/dhcp6/tests/config_parser_unittest.cc

@@ -27,11 +27,11 @@
 #include <dhcpsrv/addr_utilities.h>
 #include <dhcpsrv/cfgmgr.h>
 #include <dhcpsrv/cfg_hosts.h>
-#include <dhcpsrv/defaults.h>
 #include <dhcpsrv/subnet.h>
 #include <dhcpsrv/subnet_selector.h>
 #include <dhcpsrv/testutils/config_result_check.h>
 #include <hooks/hooks_manager.h>
+#include <defaults.h>
 
 #include "test_data_files_config.h"
 #include "test_libraries.h"

src/lib/dhcpsrv/defaults.h

@@ -14,7 +14,10 @@
 
 /// @file   defaults.h
 /// 
-/// @brief Contains the default values of the server.
+/// @brief Contains the default values for various parameters.
+///
+/// While the content of this file is currently small, it is envisaged that it
+/// will grow over time.
 
 #ifndef DEFAULTS_H
 #define DEFAULTS_H