From 4abdfe5667d7435cdb756e584060ff85206a8fb7 Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Thu, 7 Apr 2005 21:14:22 +0000
Subject: [PATCH] pullup from trunk

ticket: 2960
version_fixed: 1.4.1

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17167 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/lib/gssapi/ChangeLog           |  5 +++++
 src/lib/gssapi/configure.in        |  4 ++++
 src/lib/gssapi/generic/ChangeLog   | 11 +++++++++++
 src/lib/gssapi/generic/Makefile.in |  7 ++++---
 src/lib/gssapi/generic/gssapi.hin  | 16 +++-------------
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index dbceda08c..af6063232 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -2,6 +2,11 @@
 
 	* Makefile.in (LIBINITFUNC, LIBFINIFUNC): Define.
 
+2005-02-02  Ken Raeburn  <raeburn@mit.edu>
+
+	* configure.in: Check for xom.h.  Set include_xom to a C include
+	directive or comment, and substitute it in the Makefiles.
+
 2005-01-17  Jeffrey Altman <jaltman@mit.edu>
 
         * gss_libinit.c: implement cleanup of mutexes, static vars, etc for Windows
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index 72ab7983a..1a4f1755e 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -9,6 +9,10 @@ AC_CHECK_SIZEOF(long)
 AC_CHECK_HEADER(stdint.h,[
 	include_stdint="\\#include <stdint.h>"], )
 AC_SUBST(include_stdint)
+AC_CHECK_HEADER(xom.h,[
+	include_xom="\\#include <xom.h>"],[
+	include_xom="/* no xom.h */"])
+AC_SUBST(include_xom)
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
 V5_AC_OUTPUT_MAKEFILE(. generic krb5)
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 7643a97a1..00370a77e 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,14 @@
+2005-02-02  Ken Raeburn  <raeburn@mit.edu>
+
+	* Makefile.in (gssapi.h): Change SIZEOF symbols to start with GSS_
+	when extracting from autoconf.h.  Don't look for HAVE_ or USE_
+	symbols.  Add ${include_xom} to the prologue.
+	(include_xom): New variable.
+	* gssapi.hin: Always include stddef.h unconditionally.  Don't
+	conditionally include xom.h here.
+	(GSS_SIZEOF_INT, GSS_SIZEOF_LONG, GSS_SIZEOF_SHORT): Don't
+	define, except on Windows.
+
 2004-06-22  Ken Raeburn  <raeburn@mit.edu>
 
 	* gssapi.hin: Don't test macintosh or __MWERKS__.
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 9691e1a4c..ce4dfdcea 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -37,14 +37,15 @@ $(OUTPRE)gssapi_err_generic.$(OBJEXT): gssapi_err_generic.c
 gssapi_err_generic.h: gssapi_err_generic.et
 gssapi_err_generic.c: gssapi_err_generic.et
 
+include_xom=@include_xom@
+##DOS##include_xom=
 gssapi.h: gssapi.hin
 	@echo "Creating gssapi.h" ; \
 	h=gss$$$$; $(RM) $$h; \
 	(echo "/* This is the gssapi.h prologue. */"; \
 	echo "/* It contains some choice pieces of autoconf.h */"; \
-	grep SIZEOF $(BUILDTOP)/include/krb5/autoconf.h; \
-	grep 'HAVE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h; \
-	grep 'USE_.*_H' $(BUILDTOP)/include/krb5/autoconf.h; \
+	sed -n "/SIZEOF/s//GSS_&/p" < $(BUILDTOP)/include/krb5/autoconf.h; \
+	echo "$(include_xom)"; \
 	echo "/* End of gssapi.h prologue. */"; \
 	cat $(srcdir)/gssapi.hin )> $$h && \
 	(set -x; $(MV) $$h $@) ; e=$$?; $(RM) $$h; exit $$e
diff --git a/src/lib/gssapi/generic/gssapi.hin b/src/lib/gssapi/generic/gssapi.hin
index 1c1444415..83fe62bb1 100644
--- a/src/lib/gssapi/generic/gssapi.hin
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -44,6 +44,9 @@ extern "C" {
 
 #if defined(_MSDOS) || defined(_WIN32)
 #include <win-mac.h>
+#define GSS_SIZEOF_SHORT SIZEOF_SHORT
+#define GSS_SIZEOF_LONG  SIZEOF_LONG
+#define GSS_SIZEOF_INT   SIZEOF_INT
 #endif
 
 #ifndef KRB5_CALLCONV
@@ -51,29 +54,16 @@ extern "C" {
 #define KRB5_CALLCONV_C
 #endif
 
-#define	GSS_SIZEOF_INT		SIZEOF_INT
-#define	GSS_SIZEOF_LONG		SIZEOF_LONG
-#define	GSS_SIZEOF_SHORT	SIZEOF_SHORT
-
 /*
  * First, include stddef.h to get size_t defined.
  */
-#if	HAVE_STDDEF_H
 #include <stddef.h>
-#endif	/* HAVE_STDDEF_H */
 
 /*
  * POSIX says that sys/types.h is where size_t is defined.
  */
 #include <sys/types.h>
 
-/*
- * If the platform supports the xom.h header file, it should be included here.
- */
-#if	HAVE_XOM_H
-#include <xom.h>
-#endif	/* HAVE_XOM_H */
-
 /*
  * $Id$
  */
-- 
2.26.2