aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1997-10-22 19:43:03 +0000
committerEzra Peisach <epeisach@mit.edu>1997-10-22 19:43:03 +0000
commit025387aca489338b8134f1adb612343069618619 (patch)
tree6b276d5c2a0a40fab2d14912267cd795bf8628fb
parent297021298ebfb22240f1d0626d9188d4287ca5bf (diff)
downloadkrb5-025387aca489338b8134f1adb612343069618619.zip
krb5-025387aca489338b8134f1adb612343069618619.tar.gz
krb5-025387aca489338b8134f1adb612343069618619.tar.bz2
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
-rw-r--r--src/kadmin/dbutil/ChangeLog4
-rw-r--r--src/kadmin/dbutil/tcl_wrapper.c4
-rw-r--r--src/kadmin/testing/util/ChangeLog5
-rw-r--r--src/kadmin/testing/util/tcl_kadm5.c4
-rw-r--r--src/kadmin/testing/util/tcl_krb5_hash.c4
-rw-r--r--src/kadmin/testing/util/tcl_ovsec_kadm.c4
-rw-r--r--src/kadmin/testing/util/test.c4
7 files changed, 29 insertions, 0 deletions
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 9d0cfac..892ba1d 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 d527fa0..10b860c 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 cb0960f..c5d3d4c 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 409f023..034ac87 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 95a3451..7fe1b8f 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 40a854e..6c09aea 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 f9da052..702f683 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)