[#137,!42] Kea version moved to separate header.

diff --git a/Makefile.am b/Makefile.am
index 2c0733c29ca33c3de61c03dc9811d88091cb1532..cbd7f959186bd57ba8da816af09254de0da48bcd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -150,4 +150,4 @@ CLEANFILES = $(abs_top_builddir)/logger_lockfile
 
 # config.h may be included by headers supplied for building user-written
 # hooks libraries, so we need to include it in the distribution.
-pkginclude_HEADERS = config.h
+pkginclude_HEADERS = config.h kea_version.h

diff --git a/configure.ac b/configure.ac
index b784dfc19a970b5b0ea1dd7cd33d160bb6f886fc..ad6886ec03e960f123e6714c232eaa94593b0e27 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,11 @@ else
 fi
 # Export EXTENDED_VERSION to config.h
 # This will be either "tarball" or "git abcd".
-AC_DEFINE_UNQUOTED([EXTENDED_VERSION], ["${KEA_SRCID}"], [Extended Kea version])
+# We do not want to put this in a config.h, because it messes up ccache
+# horribly. When building different branches, the commit-id is different
+# and since the config.h is included in most files *and* has a different
+# content, ccache can't use cached content and thus has to do full compilation.
+echo "#define EXTENDED_VERSION \"${KEA_SRCID}\"" > kea_version.h
 
 # Find a separator for path_replacer
 for sep in "+" "," ";" "&" "__NONE__"; do

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 2905c031f08acb1df5954d44e041ca14bf328739..f8fca028f899f0a31a740f2e5131c666f9090b4e 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -5,6 +5,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
+
 #include <dhcp/dhcp4.h>
 #include <dhcp/duid.h>
 #include <dhcp/hwaddr.h>

diff --git a/src/bin/dhcp4/main.cc b/src/bin/dhcp4/main.cc
index 4f07e49ca7218f13aa995b46825bff3891fa09e2..357360bca4734deba4e2a60e445db9543813a6c3 100644 (file)
--- a/src/bin/dhcp4/main.cc
+++ b/src/bin/dhcp4/main.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 
 #include <dhcp4/ctrl_dhcp4_srv.h>
 #include <dhcp4/dhcp4_log.h>

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 684ab39805eec1ce9ca2900ca74bb31e4bbe8901..c0adebbba3b033039d9cb75b4eb3cacf6b2c79f3 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 
 #include <asiolink/io_address.h>
 #include <dhcp_ddns/ncr_msg.h>

diff --git a/src/bin/dhcp6/main.cc b/src/bin/dhcp6/main.cc
index 2d12fe897c2176f0a044e24a9f1ca417d7d315e2..f16e770723e0d8a0c10626175b02447c16e9706c 100644 (file)
--- a/src/bin/dhcp6/main.cc
+++ b/src/bin/dhcp6/main.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 
 #include <dhcp6/ctrl_dhcp6_srv.h>
 #include <dhcp6/dhcp6_log.h>

diff --git a/src/bin/lfc/lfc_controller.cc b/src/bin/lfc/lfc_controller.cc
index 0a4b12ce74458a86d20e3821676c940a52a69857..1bf3b9932cb376f4f6509daf9549f9810242ad26 100644 (file)
--- a/src/bin/lfc/lfc_controller.cc
+++ b/src/bin/lfc/lfc_controller.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 
 #include <lfc/lfc_controller.h>
 #include <lfc/lfc_log.h>

diff --git a/src/bin/netconf/main.cc b/src/bin/netconf/main.cc
index 345ef25b531fc247f3178c6a939e3313b0b145ef..14015e75b638afcfaee74fec2e6d9c6ec667484a 100644 (file)
--- a/src/bin/netconf/main.cc
+++ b/src/bin/netconf/main.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 
 #include <netconf/netconf_log.h>
 #include <exceptions/exceptions.h>

diff --git a/src/lib/cfgrpt/tests/config_report_unittests.cc b/src/lib/cfgrpt/tests/config_report_unittests.cc
index cbf1540327dfbcf50fdadc8057e95297e205dc6d..378a946819de2def9e4702494487ba3fea9d1bf7 100644 (file)
--- a/src/lib/cfgrpt/tests/config_report_unittests.cc
+++ b/src/lib/cfgrpt/tests/config_report_unittests.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 #include <cfgrpt/config_report.h>
 
 #include <gtest/gtest.h>

diff --git a/src/lib/process/d_controller.cc b/src/lib/process/d_controller.cc
index d835fd80e61e10301a1b330227fe8d578e2ae1a0..6af2106db58a60983500137efacb0e16da669f98 100644 (file)
--- a/src/lib/process/d_controller.cc
+++ b/src/lib/process/d_controller.cc
@@ -14,6 +14,7 @@
 #include <process/d_log.h>
 #include <process/d_controller.h>
 #include <process/config_base.h>
+#include <kea_version.h>
 
 #ifdef HAVE_MYSQL
 #include <dhcpsrv/mysql_lease_mgr.h>

diff --git a/src/lib/process/tests/d_controller_unittests.cc b/src/lib/process/tests/d_controller_unittests.cc
index 72f24ee116bf2c4ff0279b28661eefce105daa45..2559b5ba8735546f6987a21323232e38b502b8ec 100644 (file)
--- a/src/lib/process/tests/d_controller_unittests.cc
+++ b/src/lib/process/tests/d_controller_unittests.cc
@@ -5,6 +5,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
+#include <kea_version.h>
 
 #include <cc/command_interpreter.h>
 #include <process/testutils/d_test_stubs.h>