Changes to allow compilation --with-system-db and --enable-shared

(Do not depend on lib/db.so being present)

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

diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 919ad1fbc30da9b7278fa16081712d2c1f0b99f2..22e1d2d4ec9c96aff21be145d35fb6eae0824426 100644 (file)
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-16  Ezra Peisach  <epeisach@bu.edu>
+
+       * Makefile.in: Change to allow compilation with-system-db and
+       shared libraries.
+
 2002-11-07  Tom Yu  <tlyu@mit.edu>
 
        * svr_principal.c (kadm5_setkey_principal_3): Apply patch from

diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in
index 11fc1b631a929d006cb4ca9f8566c13b2ecf4497..54317f67a828dddd5bf3aef448eb608cb7f2a55d 100644 (file)
--- a/src/lib/kadm5/srv/Makefile.in
+++ b/src/lib/kadm5/srv/Makefile.in
@@ -12,15 +12,19 @@ LIB=kadm5srv
 LIBMAJOR=5
 LIBMINOR=1
 STOBJLISTS=../OBJS.ST OBJS.ST
+
+SHLIB_DBLIB_DEPS = $(SHLIB_DBLIB-@DB_VERSION@)
+SHLIB_DBLIB-k5  = $(TOPLIBD)/libdb$(SHLIBEXT)
+SHLIB_DBLIB-sys         = 
+
 SHLIB_EXPDEPS=\
        $(TOPLIBD)/libgssrpc$(SHLIBEXT) \
        $(TOPLIBD)/libgssapi_krb5$(SHLIBEXT) \
-       $(TOPLIBD)/libkdb5$(SHLIBEXT) \
-       $(TOPLIBD)/libdb$(SHLIBEXT) \
+       $(TOPLIBD)/libkdb5$(SHLIBEXT) $(SHLIB_DBLIB_DEPS) \
        $(TOPLIBD)/libkrb5$(SHLIBEXT) \
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
        $(TOPLIBD)/libcom_err$(SHLIBEXT)
-SHLIB_EXPLIBS =        -lgssrpc -lgssapi_krb5 -lkdb5 -ldb \
+SHLIB_EXPLIBS =        -lgssrpc -lgssapi_krb5 -lkdb5 $(DB_LIB) \
                -lkrb5 -lk5crypto -lcom_err @GEN_LIB@
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 893a77a985c8690aff10cf8bd9da35e26c6f7684..d304be74335258fc6a5e6680954068bdbd9eb320 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-16  Ezra Peisach  <epeisach@bu.edu>
+
+       * Makefile.in: Change to allow compilation with-system-db and
+       shared libraries.
+
 2002-09-13  Ken Raeburn  <raeburn@mit.edu>
 
        * kdb_db2.c (krb5_db2_db_iterate_ext): Don't call bt_rseq if

diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in
index 52af3fbb1c56bb4edf92dd21fecfbb7fd8bdd12b..c142e513c794f899d29c0a44d3ddcbe18e74ab21 100644 (file)
--- a/src/lib/kdb/Makefile.in
+++ b/src/lib/kdb/Makefile.in
@@ -12,11 +12,14 @@ LIBMAJOR=3
 LIBMINOR=2
 RELDIR=kdb
 # Depends on libk5crypto and libkrb5
+SHLIB_DBLIB_DEPS = $(SHLIB_DBLIB-@DB_VERSION@)
+SHLIB_DBLIB-k5  = $(TOPLIBD)/libdb$(SHLIBEXT)
+SHLIB_DBLIB-sys         = 
+
 SHLIB_EXPDEPS = \
        $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
-       $(TOPLIBD)/libkrb5$(SHLIBEXT) \
-       $(TOPLIBD)/libdb$(SHLIBEXT)
-SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto -ldb $(LIBS)
+       $(TOPLIBD)/libkrb5$(SHLIBEXT) $(SHLIB_DBLIB_DEPS)
+SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto $(DB_LIB) $(LIBS)
 SHLIB_DIRS=-L$(TOPLIBD)
 SHLIB_RDIRS=$(KRB5_LIBDIR)