From: Ken Raeburn <raeburn@mit.edu>
Date: Mon, 6 Jun 2005 20:37:22 +0000 (+0000)
Subject: Fix gcc preprocessor warnings due to last change
X-Git-Tag: ms-bug-test-20060525~245
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19515e00c276b3e2d630d38f74d086b9d6b70d36;p=krb5.git

Fix gcc preprocessor warnings due to last change

* configure.in: Put #undef for the PACKAGE_* symbols at the start of
autoconf.h.  Use a leading comment to hide the #undef from the autoconf
substitutions.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17228 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d0ded4ca7..8f4f9efbd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-06-06  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Put #undef for the PACKAGE_* symbols at the start
+	of autoconf.h.  Use a leading comment to hide the #undef from the
+	autoconf substitutions.
+
 2005-06-01  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Identify package in AC_INIT call.
diff --git a/src/configure.in b/src/configure.in
index f789255e2..937dca21c 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -455,6 +455,15 @@ dnl
 AC_C_INLINE
 AH_TOP([
 #ifndef KRB5_AUTOCONF_H
+/* Leading comment stops autoconf/config.status from turning these
+   into #define statements.  But the preprocessor will still pay
+   attention to them.  (Comment removal is in translation phase 3;
+   processing of #undef is phase 4.)  */
+/*x*/#undef PACKAGE_NAME
+/*x*/#undef PACKAGE_VERSION
+/*x*/#undef PACKAGE_BUGREPORT
+/*x*/#undef PACKAGE_STRING
+/*x*/#undef PACKAGE_TARNAME
 ])
 AH_BOTTOM([
 #if defined(__GNUC__) && !defined(inline)