From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 22 Jan 1996 20:48:29 +0000 (+0000)
Subject: 	* configure.in: Merge in berk_db library if needed
X-Git-Tag: krb5-1.0-beta6~591
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd4dc5d24fd5c1b86fc810106a0f4c316a29e35a;p=krb5.git

	* configure.in: Merge in berk_db library if needed

	* Makefile.in (LIB_SUBDIRS): Get location of berk_db from
		configure if needed.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7357 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index 59e0a5a65..6b80b027c 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jan 22 15:23:05 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* configure.in: Merge in berk_db library if needed.
+
+	* Makefile.in (LIB_SUBDIRS): Get location of berk_db from
+		configure if needed.
 
 Wed Dec 13 07:09:30 1995  Chris Provenzano (proven@mit.edu)
 
diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index 46be8c611..e33762c02 100644
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,16 +1,19 @@
 ##DOSBUILDTOP = ..\..
 
+HASH=@HASH@
+HASHDONE=@HASHDONE@
+
 TST=if test -n "`cat DONE`" ; then
 
 LIB_SUBDIRS= error_tables asn.1 ccache ccache/stdio ccache/file ccache/memory \
 	keytab keytab/file krb rcache free os posix \
-        $(BUILDTOP)/util/profile $(BUILDTOP)/util/berk_db/hash
+        $(BUILDTOP)/util/profile $(HASH)
 LIBUPDATE= $(BUILDTOP)/util/libupdate
 LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \
 		ccache/file/DONE ccache/memory/DONE keytab/DONE \
 		keytab/file/DONE krb/DONE rcache/DONE free/DONE os/DONE \
-		posix/DONE $(BUILDTOP)/util/profile/DONE \
-		$(BUILDTOP)/util/berk_db/hash/DONE
+		posix/DONE $(BUILDTOP)/util/profile/DONE $(HASHDONE)
+
 #
 CRYPTO_VER=@CRYPTO_SH_VERS@
 COMERR_VER=@COMERR_SH_VERS@
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index eb8ea40a6..22b1f048f 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -6,6 +6,27 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 DO_SUBDIRS
+dnl
+dnl Determine if db library is being used
+dnl
+HASH=
+hashloc="$(BUILDTOP)/util/berk_db/hash"
+HASHDONE=
+hashdone="$(BUILDTOP)/util/berk_db/hash/DONE"
+WITH_ANAME_DB
+if test "$dbval" = db; then
+  HASH=$hashloc
+  HASHDONE=$hashdone
+else
+  WITH_KDB_DB
+  if test "$dbval" = db; then 
+     HASH=$hashloc
+     HASHDONE=$hashdone
+  fi
+fi
+AC_SUBST(HASH)
+AC_SUBST(HASHDONE)
+dnl
 V5_MAKE_SHARED_LIB(libkrb5,0.1,.., ./krb5)
 CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto
 AC_SUBST(CRYPTO_SH_VERS)