[master] added CONFIG_H_WAS_INCLUDED (#3812)

diff --git a/ChangeLog b/ChangeLog
index 5eb23abd2e3e2f38e6fa7a35c05e2e724a014f6a..2eeca35b248f8d3b2d87693316fc757e683d2fb3 100644 (file)
--- 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 7e49cfd37b60f34754cd460b8c8bfefd5bbff82e..9789c68ee8286039ae4491db6895d62d671e4602 100644 (file)
--- 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