*gssapi.h: Renamed to gssapi.hin

	* gssapi.hin: Remove #ifdef USE_AUTOCONF_H; we're grepping symbols
	directly from autoconf.h now.

	* configure.in: Change CopySrcHeader to CopyHeader, as gssapi.h is
	now generated in the build tree.

	* Makefile.in: Add rules to generate gssapi.h from gssapi.hin,
	similar to how krb5.h is generated from krb5.hin.  Remove
	-DUSE_AUTOCONF_H from $(CFLAGS)

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

diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 06c0f5c5875d81cb0181f38e9c93344f94128a23..993470825ce2b07aa872d3dae8fc5d45ea22855a 100644 (file)
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,17 @@
+Mon Nov 18 12:38:34 1996  Tom Yu  <tlyu@mit.edu>
+
+       *gssapi.h: Renamed to gssapi.hin.
+
+       * gssapi.hin: Remove #ifdef USE_AUTOCONF_H; we're grepping symbols
+       directly from autoconf.h now.
+
+       * configure.in: Change CopySrcHeader to CopyHeader, as gssapi.h is
+       now generated in the build tree.
+
+       * Makefile.in: Add rules to generate gssapi.h from gssapi.hin,
+       similar to how krb5.h is generated from krb5.hin.  Remove
+       -DUSE_AUTOCONF_H from $(CFLAGS)
+
 Tue Nov  5 18:47:44 1996  Tom Yu  <tlyu@mit.edu>
 
        * Makefile.in (HDRS): Changes so that $(OBJS) will not get

diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index 74b2873172b9b522e4229dcd7c52e56428dc11a3..1e1aa7ebb8ac767eb7c96f2d6b9a5b0f352f7f5e 100644 (file)
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,4 +1,4 @@
-CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -DUSE_AUTOCONF_H
+CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\gssapi.$(LIBEXT)
@@ -31,6 +31,15 @@ gssapi_err_generic.h: gssapi_err_generic.et
 
 gssapi_err_generic.c: gssapi_err_generic.et
 
+gssapi.h: gssapi.hin
+       $(RM) $@
+       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 >> $@
+       echo "/* End of gssapi.h prologue. */"
+       cat $(srcdir)/gssapi.hin >> $@
+
 #if HasHashLibrary
 # UTIL_VALIDATE_SRC= $(srcdir)/util_validate.c
 # UTIL_VALIDATE_OBJ= util_validate.$(OBJEXT)

diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
index 035b05da3244addb2a1e5ce0bbbcd29b560b15f6..b27f461d942ede8e3dc6d9f6fb0398b8c01e64d5 100644 (file)
--- a/src/lib/gssapi/generic/configure.in
+++ b/src/lib/gssapi/generic/configure.in
@@ -9,6 +9,6 @@ AC_SIZE_T
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
-CopySrcHeader(gssapi.h,[$(EHDRDIR)])
+CopyHeader(gssapi.h,[$(EHDRDIR)])
 CopySrcHeader(gssapi_generic.h,[$(EHDRDIR)])
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/lib/gssapi/generic/gssapi.h b/src/lib/gssapi/generic/gssapi.hin
similarity index 98%
rename from src/lib/gssapi/generic/gssapi.h
rename to src/lib/gssapi/generic/gssapi.hin
index c83e7e6a76b4371601acf8f2de3af6cdf9bfacf1..4d2e14d00411bf35284491a4b433311e5549986c 100644 (file)
--- a/src/lib/gssapi/generic/gssapi.h
+++ b/src/lib/gssapi/generic/gssapi.hin
@@ -91,26 +91,9 @@ typedef unsigned int uid_t;
 #define NEAR
 #endif /* !KRB5_CALLCONV */
 
-#if defined(USE_AUTOCONF_H)
-/*
- * Use autoconf generated header.
- */
-#include "autoconf.h"
 #define        GSS_SIZEOF_INT          SIZEOF_INT
 #define        GSS_SIZEOF_LONG         SIZEOF_LONG
 #define        GSS_SIZEOF_SHORT        SIZEOF_SHORT
-#else  /* USE_AUTOCONF_H */
-    
-/*
- * Do it brute force.
- */
-#define GSS_SIZEOF_INT 4
-#define GSS_SIZEOF_LONG 4
-#define GSS_SIZEOF_SHORT 2
-/* #define     HAVE_STDDEF_H   1 */
-/* #define     HAVE_XOM_H      1 */
-
-#endif /* USE_AUTOCONF_H */
 #endif /* _MSDOS */
 
 #ifndef FAR