diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-09-18 12:39:04 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-09-18 12:39:04 +0000 |
| commit | 1c095f06517e15994d4d79e481e24c2ac6edbf32 (patch) | |
| tree | 81c229dbfad32f7794b5b4fbfc8bbdbc6edf3bf6 /src/util | |
| parent | 819c5dc266ddb969186493e4401c41eb2607ce08 (diff) | |
| download | krb5-1c095f06517e15994d4d79e481e24c2ac6edbf32.tar.gz krb5-1c095f06517e15994d4d79e481e24c2ac6edbf32.tar.xz krb5-1c095f06517e15994d4d79e481e24c2ac6edbf32.zip | |
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
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/berk_db/ChangeLog | 8 | ||||
| -rw-r--r-- | src/util/berk_db/Makefile.in | 7 | ||||
| -rw-r--r-- | src/util/berk_db/configure.in | 15 |
3 files changed, 10 insertions, 20 deletions
diff --git a/src/util/berk_db/ChangeLog b/src/util/berk_db/ChangeLog index 450ef9cdd3..88a37ddc56 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 a3f6faf4aa..473ccc2eca 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 4c99823f74..9a0a67304f 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 |