From ec45ae60536190c2f5fbf272a9acfe0a85824e24 Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Wed, 19 Sep 2018 15:51:00 -0500
Subject: [PATCH] configure.ac: Add missing double include guard

This is primarily a sanity check (identified by clang-tidy).

Change-Id: I92d05fdfed0e32c0e39cc2f8ce412b613c0a38fc
Reviewed-on: https://gerrit.openafs.org/13333
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
---
 acinclude.m4         | 1 +
 src/cf/autoheader.m4 | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9fa6340d72..676532eac6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -5,6 +5,7 @@ dnl NB: Because this code is a macro, references to positional shell
 dnl parameters must be done like $[]1 instead of $1
 
 AC_DEFUN([OPENAFS_CONFIGURE_COMMON],[
+OPENAFS_AUTOHEADER_TOP
 OPENAFS_AUTOHEADER_BOTTOM
 AC_CANONICAL_HOST
 SRCDIR_PARENT=`pwd`
diff --git a/src/cf/autoheader.m4 b/src/cf/autoheader.m4
index b4be641580..6d9d54a472 100644
--- a/src/cf/autoheader.m4
+++ b/src/cf/autoheader.m4
@@ -1,3 +1,8 @@
+AC_DEFUN([OPENAFS_AUTOHEADER_TOP],[
+    AH_TOP([
+#ifndef __AFSCONFIG_H
+#define __AFSCONFIG_H 1])
+])
 AC_DEFUN([OPENAFS_AUTOHEADER_BOTTOM],[
     AH_BOTTOM([
 #undef HAVE_RES_SEARCH
@@ -57,5 +62,6 @@ AC_DEFUN([OPENAFS_AUTOHEADER_BOTTOM],[
 #undef ENABLE_REDHAT_BUILDSYS
 #if defined(ENABLE_REDHAT_BUILDSYS) && defined(KERNEL) && defined(REDHAT_FIX)
 # include "redhat-fix.h"
-#endif])
+#endif
+#endif /* __AFSCONFIG_H */])
 ])