[src/trunk]: src/crypto/dist/heimdal/lib Prepend krb5/ to include paths that ...

[elric <elric%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cfd29b8fb55c
branches:  trunk
changeset: 542329:cfd29b8fb55c
user:      elric <elric%NetBSD.org@localhost>
date:      Sun Jan 26 22:06:39 2003 +0000

description:
Prepend krb5/ to include paths that live in /usr/include/krb5/ so that
we can deprecate the requirement of -I/usr/include/krb5 when building
kerberos apps.

diffstat:

 crypto/dist/heimdal/lib/hdb/hdb.h        |   8 ++++----
 crypto/dist/heimdal/lib/krb5/krb5.h      |  14 +++++++-------
 crypto/dist/heimdal/lib/roken/roken.h.in |   4 ++--
 crypto/dist/heimdal/lib/sl/ss.h          |   4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs (109 lines):

diff -r fba8035a5c59 -r cfd29b8fb55c crypto/dist/heimdal/lib/hdb/hdb.h
--- a/crypto/dist/heimdal/lib/hdb/hdb.h Sun Jan 26 21:59:49 2003 +0000
+++ b/crypto/dist/heimdal/lib/hdb/hdb.h Sun Jan 26 22:06:39 2003 +0000
@@ -32,14 +32,14 @@
  */
 
 /* $Heimdal: hdb.h,v 1.31 2000/07/08 16:03:37 joda Exp $
-   $NetBSD: hdb.h,v 1.1.1.3 2002/09/12 12:41:40 joda Exp $ */
+   $NetBSD: hdb.h,v 1.2 2003/01/26 22:06:39 elric Exp $ */
 
 #ifndef __HDB_H__
 #define __HDB_H__
 
-#include <hdb_err.h>
+#include <krb5/hdb_err.h>
 
-#include <hdb_asn1.h>
+#include <krb5/hdb_asn1.h>
 
 enum hdb_lockop{ HDB_RLOCK, HDB_WLOCK };
 
@@ -87,6 +87,6 @@
                                              hdb_entry*, void*);
 extern krb5_kt_ops hdb_kt_ops;
 
-#include <hdb-protos.h>
+#include <krb5/hdb-protos.h>
 
 #endif /* __HDB_H__ */
diff -r fba8035a5c59 -r cfd29b8fb55c crypto/dist/heimdal/lib/krb5/krb5.h
--- a/crypto/dist/heimdal/lib/krb5/krb5.h       Sun Jan 26 21:59:49 2003 +0000
+++ b/crypto/dist/heimdal/lib/krb5/krb5.h       Sun Jan 26 22:06:39 2003 +0000
@@ -32,7 +32,7 @@
  */
 
 /* $Heimdal: krb5.h,v 1.205 2002/09/03 17:31:47 joda Exp $
-   $NetBSD: krb5.h,v 1.1.1.6 2002/09/12 12:41:41 joda Exp $ */
+   $NetBSD: krb5.h,v 1.2 2003/01/26 22:06:40 elric Exp $ */
 
 #ifndef __KRB5_H__
 #define __KRB5_H__
@@ -44,12 +44,12 @@
 typedef socklen_t krb5_socklen_t;
 typedef ssize_t krb5_ssize_t;
 
-#include <asn1_err.h>
-#include <krb5_err.h>
-#include <heim_err.h>
-#include <k524_err.h>
+#include <krb5/asn1_err.h>
+#include <krb5/krb5_err.h>
+#include <krb5/heim_err.h>
+#include <krb5/k524_err.h>
 
-#include <krb5_asn1.h>
+#include <krb5/krb5_asn1.h>
 
 /* name confusion with MIT */
 #ifndef KRB5KDC_ERR_KEY_EXP
@@ -670,7 +670,7 @@
 struct getargs;
 struct sockaddr;
 
-#include <krb5-protos.h>
+#include <krb5/krb5-protos.h>
 
 #endif /* __KRB5_H__ */
 
diff -r fba8035a5c59 -r cfd29b8fb55c crypto/dist/heimdal/lib/roken/roken.h.in
--- a/crypto/dist/heimdal/lib/roken/roken.h.in  Sun Jan 26 21:59:49 2003 +0000
+++ b/crypto/dist/heimdal/lib/roken/roken.h.in  Sun Jan 26 22:06:39 2003 +0000
@@ -33,7 +33,7 @@
  */
 
 /* $Heimdal: roken.h.in,v 1.169 2002/08/26 21:43:38 assar Exp $
-   $NetBSD: roken.h.in,v 1.2 2002/09/20 21:48:58 mycroft Exp $ */
+   $NetBSD: roken.h.in,v 1.3 2003/01/26 22:06:40 elric Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -148,7 +148,7 @@
 typedef int ssize_t;
 #endif
 
-#include <roken-common.h>
+#include <krb5/roken-common.h>
 
 ROKEN_CPP_START
 
diff -r fba8035a5c59 -r cfd29b8fb55c crypto/dist/heimdal/lib/sl/ss.h
--- a/crypto/dist/heimdal/lib/sl/ss.h   Sun Jan 26 21:59:49 2003 +0000
+++ b/crypto/dist/heimdal/lib/sl/ss.h   Sun Jan 26 22:06:39 2003 +0000
@@ -31,14 +31,14 @@
  * SUCH DAMAGE. 
  */
 /* $Heimdal: ss.h,v 1.3 2000/05/25 00:15:21 assar Exp $
-   $NetBSD: ss.h,v 1.1.1.3 2002/09/12 12:41:43 joda Exp $ */
+   $NetBSD: ss.h,v 1.2 2003/01/26 22:06:41 elric Exp $ */
 
 /* SS compatibility for SL */
 
 #ifndef __ss_h__
 #define __ss_h__
 
-#include <sl.h>
+#include <krb5/sl.h>
 
 typedef SL_cmd ss_request_table;