* Makefile.in (osconf.h): Remove temp file osconf.new

* base-defs.h, dbm.h, error_def.h, sysincl.h:  Avoid #include
<krb5/...> form; use "..." form.

* config.h:  Rename to k5-config.h.  This is too common a
name, now that we use -I..../include/krb5.
* free.h:  Rename to k5-free.h.

* configure.in (AC_INIT):  Use another file (not krb5.h) as src test.

[Didn't check in the removal of <krb5/krb5.h> yet, til I check in the
other changes throughout the tree that make it work.]

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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 92bb602de99bfadaf733724ef6270e376602a791..2602e9a2c732b86f3dfe857039f4f30d4b1eb27a 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,21 @@
+Mon Feb 27 23:47:58 1995  John Gilmore  (gnu at toad.com)
+
+       * Makefile.in (osconf.h):  Remove temp file osconf.new.
+
+       * krb5.h:  Rename to ../krb5.h so it can be #included by end users
+       without the use of slashes or extra -I options.  First step in
+       making it stand alone without a train of a dozen other include
+       files tagging along behind.
+
+       * base-defs.h, dbm.h, error_def.h, sysincl.h:  Avoid #include
+       <krb5/...> form; use "..." form.
+
+       * config.h:  Rename to k5-config.h.  This is too common a
+       name, now that we use -I..../include/krb5.
+       * free.h:  Rename to k5-free.h.
+
+       * configure.in (AC_INIT):  Use another file (not krb5.h) as src test.
+
 Mon Feb 27 11:35:49 1995 Keith Vetter (keithv@fusion.com)
 
         * config.h: added windows interface keyword for varargs functions,

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index 6eb9c3cc89b0b109796d1a1f4deb4007653413c7..fe0aabea111041dbae445c19e8645e75ca4dbb3c 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -57,7 +57,7 @@ OSCONFSRC = $(srcdir)/stock/osconf.h
 osconf.h: $(OSCONFSRC)
        cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
        @if cmp -s osconf.new osconf.h ; then :; \
-       else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h) fi
+       else (set -x; $(RM) osconf.h ; $(CP) osconf.new osconf.h; $(RM) osconf.new) fi
 
 clean:: clean-$(WHAT)
        $(RM) osconf.new $(BUILT_HEADERS)

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index 05638ebd0ed0ab2694fd8a4a414c27f5d07c3158..eb2f5cfc18c18047834e10ac2a601539f5fdd7a9 100644 (file)
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -27,7 +27,7 @@
 #ifndef KRB5_BASE_DEFS__
 #define KRB5_BASE_DEFS__
 
-#include <krb5/wordsize.h>
+#include "wordsize.h"
 
 #ifndef FALSE
 #define        FALSE   0

diff --git a/src/include/krb5/dbm.h b/src/include/krb5/dbm.h
index 4453dbd8d125971c5c0775b670ab21495c78ff5c..9d0c6d9de352b85d53fdd64c1dd76b514a75204e 100644 (file)
--- a/src/include/krb5/dbm.h
+++ b/src/include/krb5/dbm.h
@@ -28,7 +28,7 @@
 #ifndef KRB5_DBM_COMPAT__
 #define KRB5_DBM_COMPAT__
 
-#include <krb5/osconf.h>
+#include "osconf.h"
 
 #ifndef ODBM
 #include <ndbm.h>

diff --git a/src/include/krb5/error_def.h b/src/include/krb5/error_def.h
index 8f0b687db0aaee665ff517558504917b0f5ecfbb..ef69a2cb7a50f1cec54d44983053c371f25aab6d 100644 (file)
--- a/src/include/krb5/error_def.h
+++ b/src/include/krb5/error_def.h
@@ -28,13 +28,13 @@
 #ifndef KRB5_ERROR_DEF__
 #define KRB5_ERROR_DEF__
 
-#include <krb5/krb5_err.h>
-#include <krb5/kdb5_err.h>
-#include <krb5/kv5m_err.h>
+#include "krb5_err.h"
+#include "kdb5_err.h"
+#include "kv5m_err.h"
 #ifndef KRB5_USE_ISODE
-#include <krb5/asn1_err.h>
+#include "asn1_err.h"
 #else
-#include <krb5/isode_err.h>
+#include "isode_err.h"
 #endif
 #include <errno.h>
 

diff --git a/src/include/krb5/config.h b/src/include/krb5/k5-config.h
similarity index 100%
rename from src/include/krb5/config.h
rename to src/include/krb5/k5-config.h

diff --git a/src/include/krb5/free.h b/src/include/krb5/k5-free.h
similarity index 100%
rename from src/include/krb5/free.h
rename to src/include/krb5/k5-free.h

diff --git a/src/include/krb5/sysincl.h b/src/include/krb5/sysincl.h
index c34c79a56e5a1ff68101789662954cc8d4fa1764..38f691c8ecc5234495cb2af775378836f73f7ca0 100644 (file)
--- a/src/include/krb5/sysincl.h
+++ b/src/include/krb5/sysincl.h
@@ -33,7 +33,7 @@
 #include <sys/types.h>                 /* needed for much of the reset */
 #endif /* KRB5_SYSTYPES__ */
 
-#include <krb5/osconf.h>               /* USE*TIME_H macros */
+#include "osconf.h"                    /* USE*TIME_H macros */
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME