* configure.in: Put definition of KRB5_AUTOCONF_H at top of header file, not

bottom.  Disable the #undefs for the PACKAGE_ macros.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index f4fd75f66a1bf2fc1c0968a8b53b5c5df9cdf813..435da2f8ceac5c72360173eeb810df831aab8d66 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-30  Ken Raeburn  <raeburn@mit.edu>
+
+       * configure.in: Put definition of KRB5_AUTOCONF_H at top of header
+       file, not bottom.  Disable the #undefs for the PACKAGE_ macros.
+
 2006-03-28  Ken Raeburn  <raeburn@mit.edu>
 
        * configure.in: Check for getusershell, lstat, pwd.h,

diff --git a/src/configure.in b/src/configure.in
index 6471be343a09b43052c2e3b4c07d71d60cdd0a20..e09f60317a2c23577b1a1839ab24c662a3976c50 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -475,6 +475,8 @@ dnl
 AC_C_INLINE
 AH_TOP([
 #ifndef KRB5_AUTOCONF_H
+#define KRB5_AUTOCONF_H
+#if 0
 /* 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;
@@ -484,15 +486,14 @@ AH_TOP([
 /*x*/#undef PACKAGE_BUGREPORT
 /*x*/#undef PACKAGE_STRING
 /*x*/#undef PACKAGE_TARNAME
+#endif
 ])
 AH_BOTTOM([
 #if defined(__GNUC__) && !defined(inline)
 /* Silence gcc pedantic warnings about ANSI C.  */
 # define inline __inline__
 #endif
-
-#define KRB5_AUTOCONF_H
-#endif
+#endif /* KRB5_AUTOCONF_H */
 ])
 dnl
 dnl Not used yet, but let's find out what we've got on the platforms