* configure.in, Makefile.in

	Better support of alternate db libraries.
	Berkeley db is now a separate library

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

diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in
index e33762c02d9b53d128995e1678ade0f54e461def..1b993c025cd4f5e059ec60537868b7b4191d4c04 100644 (file)
--- a/src/lib/krb5/Makefile.in
+++ b/src/lib/krb5/Makefile.in
@@ -1,25 +1,26 @@
 ##DOSBUILDTOP = ..\..
 
-HASH=@HASH@
-HASHDONE=@HASHDONE@
+ANAME_DBDEP=@ANAME_DBDEP@
+ANAME_DBLIB=@ANAME_DBLIB@
 
 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 $(HASH)
+        $(BUILDTOP)/util/profile
 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 $(HASHDONE)
+               posix/DONE $(BUILDTOP)/util/profile/DONE
 
 #
 CRYPTO_VER=@CRYPTO_SH_VERS@
 COMERR_VER=@COMERR_SH_VERS@
 DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT).$(CRYPTO_VER) \
-       $(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER)
-SHLIB_LIBS=-lcrypto -lcom_err
+       $(TOPLIBD)/libcom_err.$(SHEXT).$(COMERR_VER) \
+       $(ANAME_DBDEP)
+SHLIB_LIBS=-lcrypto -lcom_err $(ANAME_DBLIB)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@   
 #      $(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@

diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 22d35c886d402225f1e7a55b20baf46a6fa344e8..74cc026c419d5fea6f4be4496b7c6fd1803ae104 100644 (file)
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -7,25 +7,11 @@ 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)
+USE_ANAME
+ANAME_DBDEP="$kaname_dbdep"
+ANAME_DBLIB="$kaname_libs"
+AC_SUBST(ANAME_DBDEP)
+AC_SUBST(ANAME_DBLIB)
 dnl
 V5_MAKE_SHARED_LIB(libkrb5,0.1,.., ./krb5)
 CRYPTO_SH_VERS=$krb5_cv_shlib_version_libcrypto