* configure.in: Change WITH_KDB_DB to USE_KDB5_LIBRARIES and add

		KRB5_LIBRARIES.

	* Makefile.in: Use libraries as specified by configure. Set
		LD_LIBRARY_PATH for tests.

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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 186ce8c012b86680a4d2190a7e735943406165c8..7721c860680a43574a6d2b010bb720da542a8093 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,11 @@
+Sun Mar 17 20:55:41 1996  Ezra Peisach  <epeisach@dumpster.rose.brandeis.edu>
+
+       * configure.in: Change WITH_KDB_DB to USE_KDB5_LIBRARIES and add
+               KRB5_LIBRARIES.
+
+       * Makefile.in: Use libraries as specified by configure. Set
+               LD_LIBRARY_PATH for tests.
+
 Sun Mar  3 10:41:04 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * configure.in: Change WITH_DB to WITH_KDB_DB

diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 3e96d8a7c8277184be999f765738c2b02040e10d..a725dbe7c95afc5d30aa6b9a6c4573158141a942 100644 (file)
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -38,17 +38,11 @@ install:: libkdb5.a
 clean::
        $(RM) libkdb5.a
 
-KDB5LIB =      libkdb5.a
-COMERRLIB =    $(TOPLIBD)/libcom_err.a
-KRB5LIB =      $(TOPLIBD)/libkrb5.a
-CRYPTOLIB =    $(TOPLIBD)/libcrypto.a
-KLIBS =                $(KDB5LIB) $(KRB5LIB) $(CRYPTOLIB) $(COMERRLIB)
-
-t_kdb: t_kdb.o $(KLIBS)
-       $(LD) -o t_kdb t_kdb.o $(KLIBS) $(LIBS)
+t_kdb: t_kdb.o $(DEPLIBS)
+       $(LD) $(LDFLAGS) $(LDARGS) -o t_kdb t_kdb.o $(LIBS)
 
 check::        t_kdb
-       ./t_kdb
+       LD_LIBRARY_PATH=$(TOPLIBD) ; export LD_LIBRARY_PATH ; ./t_kdb
 
 clean::
        $(RM) t_kdb t_kdb.o

diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in
index f5dc3aadc610ebe3f6769a6cb1951ee60ce7a1c8..2065cfa24241c2da1b3bb2439b5daaf9c49c61b6 100644 (file)
--- a/src/lib/kdb/configure.in
+++ b/src/lib/kdb/configure.in
@@ -5,9 +5,10 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_HAVE_HEADERS(unistd.h)
-WITH_KDB_DB
-V5_USE_SHARED_LIB
 AC_CHECK_FUNCS(srand48 srand srandom umask)
+V5_USE_SHARED_LIB
+USE_KDB5_LIBRARY
+KRB5_LIBRARIES
 LinkFileDir(../libkdb5.a, libkdb5.a, ./kdb)
 AppendRule([all:: libkdb5.a])
 AppendRule([all-unix:: ../libkdb5.a])