From: Ezra Peisach <epeisach@mit.edu>
Date: Mon, 18 Sep 1995 12:39:04 +0000 (+0000)
Subject: Makefile.in (check): Only build libdb.a when making the self checks. Do
X-Git-Tag: krb5-1.0-beta6~1055
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c095f06517e15994d4d79e481e24c2ac6edbf32;p=krb5.git

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 450ef9cdd..88a37ddc5 100644
--- 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 a3f6faf4a..473ccc2ec 100644
--- 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 4c99823f7..9a0a67304 100644
--- 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