From 025387aca489338b8134f1adb612343069618619 Mon Sep 17 00:00:00 2001
From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 22 Oct 1997 19:43:03 +0000
Subject: [PATCH] Include either tcl.h or tcl/tcl.h. On debian linux, the tcl
 development headers live in a subdir.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10243 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/dbutil/ChangeLog              | 4 ++++
 src/kadmin/dbutil/tcl_wrapper.c          | 4 ++++
 src/kadmin/testing/util/ChangeLog        | 5 +++++
 src/kadmin/testing/util/tcl_kadm5.c      | 4 ++++
 src/kadmin/testing/util/tcl_krb5_hash.c  | 4 ++++
 src/kadmin/testing/util/tcl_ovsec_kadm.c | 4 ++++
 src/kadmin/testing/util/test.c           | 4 ++++
 7 files changed, 29 insertions(+)

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 9d0cfac75..892ba1db3 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,7 @@
+Wed Oct 22 15:39:38 1997  Ezra Peisach  <epeisach@mit.edu>
+
+	* tcl_wrapper.c: Include either tcl.h or tcl/tcl.h
+
 Fri Jul 25 15:46:24 1997  Tom Yu  <tlyu@mit.edu>
 
 	* loadv4.c:
diff --git a/src/kadmin/dbutil/tcl_wrapper.c b/src/kadmin/dbutil/tcl_wrapper.c
index d527fa0d1..10b860c9f 100644
--- a/src/kadmin/dbutil/tcl_wrapper.c
+++ b/src/kadmin/dbutil/tcl_wrapper.c
@@ -26,7 +26,11 @@
 
 #include "k5-int.h"
 #include "kdb5_edit.h"
+#ifdef HAVE_TCL_H
 #include <tcl.h>
+#elif defined(HAVE_TCL_TCL_H)
+#include <tcl/tcl.h>
+#endif
 
 #define CMDDECL(x) int x(clientData, interp, argc, argv)\
     ClientData clientData;\
diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog
index cb0960fba..c5d3d4cc5 100644
--- a/src/kadmin/testing/util/ChangeLog
+++ b/src/kadmin/testing/util/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 22 15:40:34 1997  Ezra Peisach  <epeisach@dumpster.rose.brandeis.edu>
+
+	* test.c, tcl_ovsec_kadm.c, tcl_krb5_hash.c, tcl_kadm5.c: Include
+	 	either tcl.h or tcl/tcl.h
+
 Mon Mar 31 17:43:06 1997  Barry Jaspan  <bjaspan@mit.edu>
 
 	* Makefile.in: be more verbose if Tcl is unavailable
diff --git a/src/kadmin/testing/util/tcl_kadm5.c b/src/kadmin/testing/util/tcl_kadm5.c
index 409f02396..034ac877a 100644
--- a/src/kadmin/testing/util/tcl_kadm5.c
+++ b/src/kadmin/testing/util/tcl_kadm5.c
@@ -1,6 +1,10 @@
 #include <stdio.h>
 #include <string.h>
+#if HAVE_TCL_H
 #include <tcl.h>
+#elif HAVE_TCL_TCL_H
+#include <tcl/tcl.h>
+#endif
 #define USE_KADM5_API_VERSION 2
 #include <kadm5/admin.h>
 #include <com_err.h>
diff --git a/src/kadmin/testing/util/tcl_krb5_hash.c b/src/kadmin/testing/util/tcl_krb5_hash.c
index 95a3451d9..7fe1b8f74 100644
--- a/src/kadmin/testing/util/tcl_krb5_hash.c
+++ b/src/kadmin/testing/util/tcl_krb5_hash.c
@@ -30,7 +30,11 @@
  * been freed by the caller).
  */
 
+#if HAVE_TCL_H
 #include <tcl.h>
+#elif HAVE_TCL_TCL_H
+#include <tcl/tcl.h>
+#endif
 #include <assert.h>
 
 #define SEP_STR "$"
diff --git a/src/kadmin/testing/util/tcl_ovsec_kadm.c b/src/kadmin/testing/util/tcl_ovsec_kadm.c
index 40a854e95..6c09aeaaf 100644
--- a/src/kadmin/testing/util/tcl_ovsec_kadm.c
+++ b/src/kadmin/testing/util/tcl_ovsec_kadm.c
@@ -1,6 +1,10 @@
 #include <stdio.h>
 #include <string.h>
+#if HAVE_TCL_H
 #include <tcl.h>
+#elif HAVE_TCL_TCL_H
+#include <tcl/tcl.h>
+#endif
 #define USE_KADM5_API_VERSION 1
 #include <kadm5/admin.h>
 #include <com_err.h>
diff --git a/src/kadmin/testing/util/test.c b/src/kadmin/testing/util/test.c
index f9da05238..702f683cd 100644
--- a/src/kadmin/testing/util/test.c
+++ b/src/kadmin/testing/util/test.c
@@ -1,4 +1,8 @@
+#if HAVE_TCL_H
 #include <tcl.h>
+#elif HAVE_TCL_TCL_H
+#include <tcl/tcl.h>
+#endif
 
 #define _TCL_MAIN ((TCL_MAJOR_VERSION * 100 + TCL_MINOR_VERSION) >= 704)
 
-- 
2.26.2