diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-04-02 04:47:53 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-04-02 04:47:53 +0000 |
| commit | f43088e76274fdfad885f6a012efa2d18c86b58b (patch) | |
| tree | 653041682c362e032c1552868854cc83459bf253 /src/config | |
| parent | 667926b0cbc8acabaecc58f8edbfb18a738aaa86 (diff) | |
don't install in-tree libdb
Don't install the in-tree libdb. This requires that libkdb,
etc. explicitly pull in the object files of the in-tree libdb if not
using the system libdb.
ticket: new
status: open
target_version: 1.3
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15320 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/ChangeLog | 7 | ||||
| -rw-r--r-- | src/config/pre.in | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 7a0623513..21bc14adc 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,10 @@ +2003-04-01 Tom Yu <tlyu@mit.edu> + + * pre.in (KDB5_DEPLIBS): Don't depend on $(DB_DEPLIB) anymore. + (KDB5_DB_LIB): New variable; is empty if not building with system + libdb. + (KDB5_LIBS): Use $(KDB5_DB_LIB) instead of $(DB_LIB). + 2003-03-03 Tom Yu <tlyu@mit.edu> * libobj.in: Change .c.so and .c.po rules to use ALL_CFLAGS. diff --git a/src/config/pre.in b/src/config/pre.in index c36b4ee8b..b3bdec715 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -296,7 +296,7 @@ PTY_DEPLIB = $(TOPLIBD)/libpty.a KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) KRB4COMPAT_DEPLIBS = $(KRB4_DEPLIB) $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS) -KDB5_DEPLIBS = $(KDB5_DEPLIB) $(DB_DEPLIB) +KDB5_DEPLIBS = $(KDB5_DEPLIB) GSS_DEPLIBS = $(GSS_DEPLIB) GSSRPC_DEPLIBS = $(GSSRPC_DEPLIB) $(GSS_DEPLIBS) KADM_COMM_DEPLIBS = $(GSSRPC_DEPLIBS) $(KDB5_DEPLIBS) $(GSSRPC_DEPLIBS) @@ -338,6 +338,7 @@ SS_LIB-sys = @SS_LIB@ SS_LIB-k5 = $(TOPLIBD)/libss.a KDB5_LIB = -lkdb5 DB_LIB = @DB_LIB@ +KDB5_DB_LIB = @KDB5_DB_LIB@ KRB5_LIB = -lkrb5 K5CRYPTO_LIB = -lk5crypto @@ -361,7 +362,7 @@ HESIOD_LIBS = @HESIOD_LIBS@ KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(GEN_LIB) $(LIBS) KRB4COMPAT_LIBS = $(KRB4_LIB) $(DES425_LIB) $(KRB5_BASE_LIBS) -KDB5_LIBS = $(KDB5_LIB) $(DB_LIB) +KDB5_LIBS = $(KDB5_LIB) $(KDB5_DB_LIB) GSS_LIBS = $(GSS_KRB5_LIB) # needs fixing if ever used on Mac OS X! GSSRPC_LIBS = -lgssrpc $(GSS_LIBS) |