diff options
Diffstat (limited to 'src/lib/gssapi')
| -rw-r--r-- | src/lib/gssapi/generic/ChangeLog | 14 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/Makefile.in | 11 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/configure.in | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/generic/gssapi.hin (renamed from src/lib/gssapi/generic/gssapi.h) | 17 |
4 files changed, 25 insertions, 19 deletions
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 06c0f5c587..993470825c 100644 --- 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 74b2873172..1e1aa7ebb8 100644 --- 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 035b05da32..b27f461d94 100644 --- 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 index c83e7e6a76..4d2e14d004 100644 --- 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 |