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

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 9d0cfac758983b46932182687824363c631a72cc..892ba1db3090ca537c8f619080dd04b86375643c 100644 (file)
--- 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 d527fa0d183dd965fd200f35b9e9e9210ab8620c..10b860c9faac6364f8c9ee2e84fdbbdbd9e6965e 100644 (file)
--- 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 cb0960fba07034989366483ce276fc2ae83672ad..c5d3d4cc58c2832f3074187a34f0cbc802707762 100644 (file)
--- 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 409f02396c86a0aff3d23274c891c481ac8b9905..034ac877a9e5e88d2c98cdc6c2711ea5ecde0774 100644 (file)
--- 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 95a3451d9377fa6bf566f05a220feb4a89ba51cc..7fe1b8f7496391befe3cc3f043a22661829a0ae3 100644 (file)
--- 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 40a854e951d3704b3fe7e531bffce3ac0ebb7128..6c09aeaaf221df322fbe04b282dc6f8d6e622f70 100644 (file)
--- 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 f9da0523890d56d8e71c629aade61c903bf75600..702f683cd5cb466a0b522d7a22ab749e1637b911 100644 (file)
--- 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)