summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorEzra Peisach <epeisach@mit.edu>1996-03-18 02:00:35 +0000
committerEzra Peisach <epeisach@mit.edu>1996-03-18 02:00:35 +0000
commitad62a62204a54a0948e69cf48686da35cd3c924a (patch)
tree7f0b4e80de39c4b2b93dc313ac20586c202e1e33 /src/lib
parent3462ed35dd3981c4e08e6341e941dac7eb470bab (diff)
downloadkrb5-ad62a62204a54a0948e69cf48686da35cd3c924a.tar.gz
krb5-ad62a62204a54a0948e69cf48686da35cd3c924a.tar.xz
krb5-ad62a62204a54a0948e69cf48686da35cd3c924a.zip
* 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
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/kdb/ChangeLog8
-rw-r--r--src/lib/kdb/Makefile.in12
-rw-r--r--src/lib/kdb/configure.in5
3 files changed, 14 insertions, 11 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 186ce8c01..7721c8606 100644
--- 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 3e96d8a7c..a725dbe7c 100644
--- 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 f5dc3aadc..2065cfa24 100644
--- 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])