From e175f1a4d2c94b4c2f9ccce179286b04ceedb87d Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 28 Mar 2006 21:35:36 +0000
Subject: [PATCH] Include autoconf.h early in sources, and disable use of
 @DEFS@

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17794 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/clients/kdestroy/ChangeLog   | 5 +++++
 src/clients/kdestroy/Makefile.in | 1 +
 src/clients/kdestroy/kdestroy.c  | 1 +
 src/clients/kinit/ChangeLog      | 5 +++++
 src/clients/kinit/Makefile.in    | 1 +
 src/clients/kinit/kinit.c        | 1 +
 src/clients/kpasswd/ChangeLog    | 5 +++++
 src/clients/kpasswd/Makefile.in  | 1 +
 src/clients/kpasswd/kpasswd.c    | 1 +
 src/clients/kvno/ChangeLog       | 5 +++++
 src/clients/kvno/Makefile.in     | 1 +
 src/clients/kvno/kvno.c          | 1 +
 12 files changed, 28 insertions(+)

diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog
index 17a82afb7..62e753722 100644
--- a/src/clients/kdestroy/ChangeLog
+++ b/src/clients/kdestroy/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28  Ken Raeburn  <raeburn@mit.edu>
+
+	* kdestroy.c: Include autoconf.h.
+	* Makefile.in (DEFS): Make empty.
+
 2004-06-16  Ken Raeburn  <raeburn@mit.edu>
 
 	* Makefile.in (all-mac): Target deleted.
diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in
index 353535822..8f95db889 100644
--- a/src/clients/kdestroy/Makefile.in
+++ b/src/clients/kdestroy/Makefile.in
@@ -2,6 +2,7 @@ thisconfigdir=./..
 myfulldir=clients/kdestroy
 mydir=kdestroy
 BUILDTOP=$(REL)..$(S)..
+DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/kdestroy/kdestroy.c b/src/clients/kdestroy/kdestroy.c
index a9072ed54..a726076a4 100644
--- a/src/clients/kdestroy/kdestroy.c
+++ b/src/clients/kdestroy/kdestroy.c
@@ -31,6 +31,7 @@
 #include <com_err.h>
 #include <string.h>
 #include <stdio.h>
+#include "autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog
index 6b97d7a2b..c06e6828a 100644
--- a/src/clients/kinit/ChangeLog
+++ b/src/clients/kinit/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (DEFS): Make empty.
+	* kinit.c: Include autoconf.h.
+
 2006-03-26  Ken Raeburn  <raeburn@mit.edu>
 
 	* kinit.c (extended_com_err_fn): New function.
diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in
index dbdf2714c..0fa2db474 100644
--- a/src/clients/kinit/Makefile.in
+++ b/src/clients/kinit/Makefile.in
@@ -2,6 +2,7 @@ thisconfigdir=./..
 myfulldir=clients/kinit
 mydir=kinit
 BUILDTOP=$(REL)..$(S)..
+DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/kinit/kinit.c b/src/clients/kinit/kinit.c
index 8160822da..82acddead 100644
--- a/src/clients/kinit/kinit.c
+++ b/src/clients/kinit/kinit.c
@@ -28,6 +28,7 @@
  */
 
 #include <krb5.h>
+#include "autoconf.h"
 #ifdef KRB5_KRB4_COMPAT
 #include <kerberosIV/krb.h>
 #define HAVE_KRB524
diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog
index b6eedd6f7..b220864ca 100644
--- a/src/clients/kpasswd/ChangeLog
+++ b/src/clients/kpasswd/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (DEFS): Make empty.
+	* kpasswd.c: Include autoconf.h.
+
 2006-02-24  Jeffrey Altman <jaltman@mit.edu>
 
  	* Makefile.in: support for 64-bit Windows builds
diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in
index aacbf91cf..cbea1bbc5 100644
--- a/src/clients/kpasswd/Makefile.in
+++ b/src/clients/kpasswd/Makefile.in
@@ -4,6 +4,7 @@ mydir=kpasswd
 BUILDTOP=$(REL)..$(S)..
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
+DEFS=
 
 kpasswd: kpasswd.o $(KRB5_BASE_DEPLIBS)
 	$(CC_LINK) -o kpasswd kpasswd.o $(KRB5_BASE_LIBS)
diff --git a/src/clients/kpasswd/kpasswd.c b/src/clients/kpasswd/kpasswd.c
index b597853cf..95e33ff6f 100644
--- a/src/clients/kpasswd/kpasswd.c
+++ b/src/clients/kpasswd/kpasswd.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <sys/types.h>
+#include "autoconf.h"
 
 #ifndef _WIN32
 #include <unistd.h>
diff --git a/src/clients/kvno/ChangeLog b/src/clients/kvno/ChangeLog
index 0982dd036..e3951433f 100644
--- a/src/clients/kvno/ChangeLog
+++ b/src/clients/kvno/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-28  Ken Raeburn  <raeburn@mit.edu>
+
+	* kvno.c: Include autoconf.h.
+	* Makefile.in (DEFS): Make empty.
+
 2006-03-26  Ken Raeburn  <raeburn@mit.edu>
 
 	* kvno.c: Include com_err.h.
diff --git a/src/clients/kvno/Makefile.in b/src/clients/kvno/Makefile.in
index 69c92bd2a..cfdf5d18b 100644
--- a/src/clients/kvno/Makefile.in
+++ b/src/clients/kvno/Makefile.in
@@ -2,6 +2,7 @@ thisconfigdir=./..
 myfulldir=clients/kvno
 mydir=kvno
 BUILDTOP=$(REL)..$(S)..
+DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
diff --git a/src/clients/kvno/kvno.c b/src/clients/kvno/kvno.c
index 4accdb4a9..a6620b936 100644
--- a/src/clients/kvno/kvno.c
+++ b/src/clients/kvno/kvno.c
@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "autoconf.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-- 
2.26.2