* configure.in: Flip again. Use AC_CHECK_HEADERS, but default the

symbol-setting.  This is Modern Autoconf Style.

* config.h:  Create from stock/config.h and stock/config.win.
* Makefile.in (BUILT_HEADERS):  Remove config.h.
(CONF_REPLACE, CONFSRC, config.h rule):  Remove.  Config.h is
a static header file, ever since imake died.  Now it really is.
(clean):  Don't remove config.new any more.

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

4 files changed, 139 insertions, 15 deletions

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 55decec66..88d1637ab 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -4,6 +4,17 @@ Mon Feb 20 16:54:51 1995 Keith Vetter (keithv@fusion.com)
           INTERFACE keyword.
         * Makefile.in: removed isode cruft ala Feb 10 changes but for windows
 
+Mon Feb 20 12:32:34 1995  John Gilmore  (gnu at toad.com)
+
+	* configure.in:  Flip again.  Use AC_CHECK_HEADERS, but default the
+	symbol-setting.  This is Modern Autoconf Style.
+
+	* config.h:  Create from stock/config.h and stock/config.win.
+	* Makefile.in (BUILT_HEADERS):  Remove config.h.
+	(CONF_REPLACE, CONFSRC, config.h rule):  Remove.  Config.h is
+	a static header file, ever since imake died.  Now it really is.
+	(clean):  Don't remove config.new any more.
+
 Thu Feb 16 20:12:23 1995  John Gilmore  (gnu at toad.com)
 
 	* configure.in:  Use AC_HAVE_HEADER rather than AC_HEADER_CHECK.
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 5ceaa0e65..fb083f8cf 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -12,14 +12,13 @@ KRB5_HEADERS = asn1.h base-defs.h ccache.h crc-32.h encryption.h \
 # these are installed here for the build from lib/krb5/error_tables but 
 # also need to be in the installed tree
 ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h
-BUILT_HEADERS = autoconf.h config.h osconf.h
+BUILT_HEADERS = autoconf.h osconf.h
 
 all:: all-$(WHAT)
 
 all-unix:: $(BUILT_HEADERS)
 
 all-windows:
-	copy stock\config.win config.h
 	echo /* not used in windows */ > osconf.h
 	echo /* not used in windows */ > autoconf.h
  
@@ -60,17 +59,8 @@ osconf.h: $(OSCONFSRC)
 	@if cmp -s osconf.new osconf.h ; then :; \
 	else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h) fi
 
-CONF_REPLACE = -e "/UnifdefRan/,/SPLIT-HERE/d"
-
-CONFSRC = $(srcdir)/stock/config.h
-
-config.h: $(CONFSRC)
-	cat $(CONFSRC) | sed $(CONF_REPLACE) > config.new
-	@if cmp -s config.new config.h ; then :; \
-	else (set -x; $(RM) config.h ; $(CP) config.new config.h) fi
-
 clean:: clean-$(WHAT)
-	$(RM) config.new osconf.new $(BUILT_HEADERS)
+	$(RM) osconf.new $(BUILT_HEADERS)
 
 clean-unix::
 	$(RM) $(ET_HEADERS)
diff --git a/src/include/krb5/config.h b/src/include/krb5/config.h
new file mode 100644
index 000000000..8355fdd9d
--- /dev/null
+++ b/src/include/krb5/config.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright 1990,1991,1994,1995 by the Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ *   require a specific license from the United States Government.
+ *   It is the responsibility of any person or organization contemplating
+ *   export to obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  M.I.T. makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
+ * Configuration definition file.
+ */
+
+
+#ifndef KRB5_CONFIG__
+#define KRB5_CONFIG__
+
+#ifdef __windows__
+/* 
+ * Machine-type definitions: PC Clone 386 running Microloss Windows
+ */
+
+#define KRB5_DBM_COMPAT__                       /* Don't load dbm.h */
+#define KRB5_KDB5__                             /* Don't load kdb.h */
+#define KRB5_KDB5_DBM__                         /* Don't load kdb_dbm.h */
+
+#define BITS16
+#define SIZEOF_INT      2
+#define SIZEOF_SHORT    2
+#define SIZEOF_LONG     4
+
+#define USE_STRING_H 
+#define HAVE_SRAND
+
+#ifndef _SIZE_T_DEFINED
+typedef unsigned int size_t;
+#define _SIZE_T_DEFINED
+#endif 
+
+#ifndef _U_TYPES_DEFINED
+typedef unsigned long u_long;
+typedef unsigned char u_char;
+#define _U_LONG_DEFINED
+#endif 
+
+#ifndef INTERFACE
+#define INTERFACE __far __export __pascal
+#endif
+#define FAR __far
+
+#else 		/* Rest of include file is for non-Microloss-Windows */
+
+#ifndef KRB5_AUTOCONF__
+#define KRB5_AUTOCONF__
+#include "autoconf.h"
+#endif
+
+#ifdef SYSV
+/* Change srandom and random to use rand and srand */
+/* Taken from the Sandia changes.  XXX  We should really just include */
+/* srandom and random into Kerberos release, since rand() is a really */
+/* bad random number generator.... [tytso:19920616.2231EDT] */
+#define random() rand()
+#define srandom(a) srand(a)
+#ifndef unicos61
+#define utimes(a,b) utime(a,b)
+#endif  /* unicos61 */
+#endif /* SYSV */
+
+/* XXX these should be parameterized soon... */
+#define PROVIDE_DES_CBC_MD5
+#define PROVIDE_DES_CBC_CRC
+#define PROVIDE_RAW_DES_CBC
+#define PROVIDE_CRC32
+#define PROVIDE_DES_CBC_CKSUM
+#define PROVIDE_RSA_MD4
+#define PROVIDE_RSA_MD5
+
+#define DEFAULT_PWD_STRING1 "Enter password:"
+#define DEFAULT_PWD_STRING2 "Re-enter password for verification:"
+
+#define	KRB5_KDB_MAX_LIFE	(60*60*24) /* one day */
+#define	KRB5_KDB_MAX_RLIFE	(60*60*24*7) /* one week */
+#define	KRB5_KDB_EXPIRATION	2145830400 /* Thu Jan  1 00:00:00 2038 UTC */
+
+/*
+ * For paranoid DOE types that don't want to give helpful error
+ * messages to the client....er, attacker
+ */
+#undef KRBCONF_VAGUE_ERRORS
+
+/*
+ * Define this if you want the KDC to modify the Kerberos database;
+ * this allows the last request information to be updated, as well as
+ * the failure count information.
+ * 
+ * Note that this doesn't work if you're using slave servers!!!  It
+ * also causes the database to be modified (and thus need to be
+ * locked) frequently.
+ */
+#undef KRBCONF_KDC_MODIFIES_KDB
+    
+/* 
+ * Windows requires a different api interface to each function. Here
+ * just define it as NULL.
+ */
+#define INTERFACE
+#define FAR
+
+#endif /* __windows__ */
+
+#endif /* KRB5_CONFIG__ */
+
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index a119f9ee5..bf97d1220 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -42,8 +42,8 @@ dnl
 dnl
 AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H))
 AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H),AC_DEFINE(NO_STDLIB_H))
-AC_HAVE_HEADERS(sys/file.h)
-AC_HAVE_HEADERS(sys/param.h)
+AC_CHECK_HEADERS(sys/file.h)
+AC_CHECK_HEADERS(sys/param.h)
 CHECK_STDARG
 
 AC_FUNC_CHECK([setvbuf],AC_DEFINE(HAS_SETVBUF))
@@ -127,7 +127,7 @@ AC_CHECK_SIZEOF(long)
 
 dnl then from osconf.h, we have
 AC_TIME_WITH_SYS_TIME
-AC_HAVE_HEADERS(sys/time.h)
+AC_CHECK_HEADERS(sys/time.h)
 
 AC_HEADER_CHECK(netinet/in.h,AC_DEFINE(KRB5_USE_INET))
 AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))