From cbb135d5f217b0692dcdbc9cfcc04f6a0dbc3922 Mon Sep 17 00:00:00 2001
From: Francis Dupont <fdupont@isc.org>
Date: Mon, 11 May 2015 15:23:18 +0200
Subject: [PATCH] [master] added CONFIG_H_WAS_INCLUDED (#3812)

---
 ChangeLog    | 5 +++++
 configure.ac | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5eb23abd2e..2eeca35b24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+928.	[build]		fdupont
+	A CONFIG_H_WAS_INCLUDED define has been added to provide
+	a way in source files to check whether config.h has been included.
+	(Trac #3812, git xxx)
+
 927.	[bug]		tmark
 	DHCPv4 no longer attempts to update the lease database with the 
 	generated FQDN when processing DHCPDISCOVERs.
diff --git a/configure.ac b/configure.ac
index 7e49cfd37b..9789c68ee8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1387,6 +1387,8 @@ AC_TRY_LINK(
 AM_CONDITIONAL(HAVE_OPTRESET, test "x$var_optreset_exists" != "xno")
 AM_COND_IF([HAVE_OPTRESET], [AC_DEFINE([HAVE_OPTRESET], [1], [Check for optreset?])])
 
+AC_DEFINE([CONFIG_H_WAS_INCLUDED], [1], [config.h inclusion marker])
+
 AC_CONFIG_FILES([compatcheck/Makefile
                  dns++.pc
                  doc/design/datasrc/Makefile
-- 
2.47.2