From 06649a09f821084b23657bb0032656c935800e1c Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@mit.edu>
Date: Fri, 23 Aug 1996 18:59:31 +0000
Subject: [PATCH] Install in prefix/bin not prefix/sbin

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8972 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/dbutil/ChangeLog    | 13 ++++++++++++-
 src/kadmin/dbutil/configure.in |  2 ++
 src/kadmin/dbutil/dumpv4.c     |  7 +++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 203b6c6e7..8f9e30b59 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -30,12 +30,23 @@ Wed Jul 31 14:55:38 1996  Tom Yu  <tlyu@mit.edu>
 
 	* kdb5_stash.c (kdb5_stash): Declare optind.
 
-Sat Jul 27 02:16:01 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+Tue Jul 30 17:51:24 1996  Samuel D Hartman  (hartmans@vorlon)
+
+	* configure.in: Use gssapi library.
 
+Sat Jul 27 02:16:01 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 	* kdb5_create.c (kdb5_create): Ignore (expected) failure in
 		open_db_and_mkey when creating database in returning exit
 		status.
 
+Wed Jul 24 02:57:16 1996  Sam Hartman  <hartmans@tertius.mit.edu>
+
+	* loadv4.cdumpv4.c : Fixes for Athena Kerberos
+
+Wed Jul 24 02:47:07 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* configure.in: Check for kdc.h and krb_db.h for Athena Kerberos.
+
 Tue Jul 23 17:03:42 1996  Tom Yu  <tlyu@voltage-multiplier.mit.edu>
 
 	* Makefile.in: add dependency for kdb5_util_ct.o
diff --git a/src/kadmin/dbutil/configure.in b/src/kadmin/dbutil/configure.in
index cc2b296e6..e383288bd 100644
--- a/src/kadmin/dbutil/configure.in
+++ b/src/kadmin/dbutil/configure.in
@@ -8,6 +8,8 @@ USE_GSSRPC_LIBRARY
 USE_KDB5_LIBRARY
 USE_DYN_LIBRARY
 USE_KRB4_LIBRARY
+USE_GSSAPI_LIBRARY
 KRB5_LIBRARIES
 V5_USE_SHARED_LIB
+AC_CHECK_HEADERS(krb_db.h kdc.h) dnl 
 V5_AC_OUTPUT_MAKEFILE
diff --git a/src/kadmin/dbutil/dumpv4.c b/src/kadmin/dbutil/dumpv4.c
index 8c85e8f1b..45babee24 100644
--- a/src/kadmin/dbutil/dumpv4.c
+++ b/src/kadmin/dbutil/dumpv4.c
@@ -31,10 +31,13 @@
 
 #include <des.h>
 #include <krb.h>
+#ifdef HAVE_KRB_DB_H
 #include <krb_db.h>
-/* MKEYFILE is now defined in kdc.h */
+#endif /*HAVE_KRB_DB_H*/
+#ifdef HAVE_KDC_H
+;/* MKEYFILE is now defined in kdc.h */
 #include <kdc.h>
-
+#endif /*HAVE_KDC_H*/
 #include <stdio.h>
 #include <kadm5/admin.h>
 #include "kdb5_util.h"
-- 
2.26.2