avoid collision with imake

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

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 598bcb5ac746babfe7b080cef6b1d0f4366133dd..214d1546fd85ada8672e149d9b9615d9b9bde661 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -18,7 +18,7 @@ KRB5_HEADERS = asn1.h base-defs.h ccache.h crc-32.h encryption.h \
                narrow.h proto.h rcache.h rsa-md4.h safepriv.h \
                sysincl.h widen.h wordsize.h
 
-all:: autoconf.h
+all:: autoconf.h osconf.h config.h
 
 includes:: autoconf.h
 
@@ -48,10 +48,19 @@ PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
                  -e "s+@KRB5SRVTABDIR+${KRB5SRVTABDIR}+" \
                  -e "/UnifdefRan/,/SPLIT-HERE/d"
 
-OSCONFSRC = $(srcdir)/stock/osconf.h $(srcdir)/stock/osauto.h
+OSCONFSRC = $(srcdir)/stock/osauto.h $(srcdir)/stock/osconf.h
 
 osconf.h: $(OSCONFSRC)
        cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
        if cmp -s osconf.new osconf.h ; then true; \
        else $(RM) osconf.h ; $(CP) osconf.new osconf.h ; fi
 
+CONF_REPLACE = -e "/UnifdefRan/,/SPLIT-HERE/d"
+
+CONFSRC = $(srcdir)/stock/confauto.h $(srcdir)/stock/config.h
+
+config.h: $(CONFSRC)
+       cat $(CONFSRC) | sed $(CONF_REPLACE) > config.new
+       if cmp -s config.new config.h ; then true; \
+       else $(RM) config.h ; $(CP) config.new config.h ; fi
+

diff --git a/src/include/krb5/stock/confauto.h b/src/include/krb5/stock/confauto.h
new file mode 100644 (file)
index 0000000..237ce42
--- /dev/null
+++ b/src/include/krb5/stock/confauto.h
@@ -0,0 +1,40 @@
+#ifdef UnifdefRan
+/* WARNING: this file is automatically generated; do not edit! */
+#endif
+/*
+ * $Source$
+ * $Author$
+ * $Id$
+ *
+ * Copyright 1990,1991 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__
+
+/**/
+#ifndef KRB5_AUTOCONF__
+#define KRB5_AUTOCONF__
+#include "autoconf.h"
+#endif

diff --git a/src/include/krb5/stock/config.h b/src/include/krb5/stock/config.h
index fe1ade3d2284cfe6c344c3f29c101f097538d085..a8ee2af8c363dd5abf2890691dd40cfca764162b 100644 (file)
--- a/src/include/krb5/stock/config.h
+++ b/src/include/krb5/stock/config.h
@@ -128,6 +128,7 @@ typedef int krb5_sigtype;
 #define BITS64
 #endif
 
+/* SPLIT-HERE */
 #ifdef SYSV
 /* Change srandom and random to use rand and srand */
 /* Taken from the Sandia changes.  XXX  We should really just include */