Makefile.in (check): Only build libdb.a when making the self checks. Do

	not install the library.

configure.in: Do not build a shared library - the contents are already
	merged into libkrb5. (continue to build shared object files though)

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

diff --git a/src/util/berk_db/ChangeLog b/src/util/berk_db/ChangeLog
index 450ef9cdd3571f940fc21642cb737587f6529d42..88a37ddc56c9433cded0747e3ae728fa89255b59 100644 (file)
--- a/src/util/berk_db/ChangeLog
+++ b/src/util/berk_db/ChangeLog
@@ -1,3 +1,11 @@
+Mon Sep 18 08:35:47 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+       * Makefile.in (check): Only build libdb.a when making the self
+               checks. Do not install the library.
+
+       * configure.in: Do not build a shared library - the contents are
+               already merged into libkrb5.
+
 Thu Aug 24 18:40:48 1995  Theodore Y. Ts'o  <tytso@dcl>
 
        * .Sanitize: Update file list

diff --git a/src/util/berk_db/Makefile.in b/src/util/berk_db/Makefile.in
index a3f6faf4aa8fd2404a0d7964b8aee6898910b57d..473ccc2ecaf2dbe21beec9e2baf675cf0a386d07 100644 (file)
--- a/src/util/berk_db/Makefile.in
+++ b/src/util/berk_db/Makefile.in
@@ -10,7 +10,7 @@ DEPLIBS=
 SHLIB_LIBS=
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@   
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
-STEXT=@STEXT@
+STEXT=a
 
 all:: all-$(WHAT)
 
@@ -34,10 +34,6 @@ libdb.$(STEXT): hash/DONE
        $(RANLIB) $@
        touch libdb.stamp
 
-install:: libdb.$(STEXT)
-       $(INSTALL_DATA) libdb.a $(DESTDIR)$(KRB5_LIBDIR)/libdb.a
-       $(RANLIB) $(DESTDIR)$(KRB5_LIBDIR)/libdb.a
-
 clean:: clean-$(WHAT)
 
 clean-unix::
@@ -60,3 +56,4 @@ clean-windows::
        @echo Making clean locally
 
 
+check:: libdb.$(STEXT)

diff --git a/src/util/berk_db/configure.in b/src/util/berk_db/configure.in
index 4c99823f74bc8ac6c15ecbbcd7625a7495a004bd..9a0a67304f84498c334d0ade762933174e60385b 100644 (file)
--- a/src/util/berk_db/configure.in
+++ b/src/util/berk_db/configure.in
@@ -7,19 +7,4 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 DO_SUBDIRS
 V5_SHARED_LIB_OBJS
-V5_MAKE_SHARED_LIB(libdb)
-AC_ARG_ENABLE([shared],
-[  --enable-shared         build shared libraries],[
-LinkFileDir([$](TOPLIBD)/libdb.[$](SHEXT), libdb.[$](SHEXT), ../util/berk_db)
-AppendRule([all -unix:: [$](TOPLIBD)/libdb.$(SHEXT)])
-AppendRule([install::  libdb.[$](SHEXT)
-       [$](INSTALL_DATA) libdb.[$](SHEXT)      \
-               [$](DESTDIR)[$](KRB5_SHLIBDIR)[$](S)libdb.[$](SHEXT)])
-])dnl
-if test -n "$krb5_cv_staticlibs_enabled" ; then
-        AppendRule([install:: libdb.[$](STEXT)
-       [$](INSTALL_DATA) libdb.[$](STEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libdb.[$](STEXT)])
-        LinkFileDir([$](TOPLIBD)/libdb.[$](STEXT),libdb.[$](STEXT),../util/berk_db)
-        AppendRule([all:: [$](TOPLIBD)/libdb.[$](STEXT)])
-fi
 V5_AC_OUTPUT_MAKEFILE