diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2004-05-05 22:33:23 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2004-05-05 22:33:23 +0000 |
| commit | 7070d016ede2a075940f61ce811ef8a3291ae0b1 (patch) | |
| tree | 05d7a62edd2d63b5e03cbee72d1cd8e2016b64f9 /src | |
| parent | 62c0fedccf95a5c5a2530c91a4d93163f8db8d7a (diff) | |
| download | krb5-7070d016ede2a075940f61ce811ef8a3291ae0b1.tar.gz krb5-7070d016ede2a075940f61ce811ef8a3291ae0b1.tar.xz krb5-7070d016ede2a075940f61ce811ef8a3291ae0b1.zip | |
* pre.in (SUPPORT_LIBNAME, SUPPORT_DEPLIB, SUPPORT_LIB): New variables.
(KRB5_BASE_LIBS): Add $(SUPPORT_LIB).
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16312 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/ChangeLog | 6 | ||||
| -rw-r--r-- | src/config/pre.in | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/config/ChangeLog b/src/config/ChangeLog index d54db188d..445a384ac 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,9 @@ +2004-05-05 Ken Raeburn <raeburn@mit.edu> + + * pre.in (SUPPORT_LIBNAME, SUPPORT_DEPLIB, SUPPORT_LIB): New + variables. + (KRB5_BASE_LIBS): Add $(SUPPORT_LIB). + 2004-05-04 Ken Raeburn <raeburn@mit.edu> * shlib.conf (alpha*-dec-osf*): Do remember to set diff --git a/src/config/pre.in b/src/config/pre.in index 2410458ca..19c2e36fe 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -306,6 +306,8 @@ CRYPTO_DEPLIB = $(TOPLIBD)/libk5crypto$(DEPLIBEXT) COM_ERR_DEPLIB = $(COM_ERR_DEPLIB-@COM_ERR_VERSION@) COM_ERR_DEPLIB-sys = # empty COM_ERR_DEPLIB-k5 = $(TOPLIBD)/libcom_err$(DEPLIBEXT) +SUPPORT_LIBNAME=krb5support +SUPPORT_DEPLIB = $(TOPLIBD)/lib$(SUPPORT_LIBNAME)$(DEPLIBEXT) # These are forced to use ".a" as an extension because they're never # built shared. @@ -315,7 +317,7 @@ SS_DEPLIB-sys = PTY_DEPLIB = $(TOPLIBD)/libpty.a APPUTILS_DEPLIB = $(TOPLIBD)/libapputils.a -KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) +KRB5_BASE_DEPLIBS = $(KRB5_DEPLIB) $(CRYPTO_DEPLIB) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) KRB4COMPAT_DEPLIBS = $(KRB4_DEPLIB) $(DES425_DEPLIB) $(KRB5_BASE_DEPLIBS) KDB5_DEPLIBS = $(KDB5_DEPLIB) GSS_DEPLIBS = $(GSS_DEPLIB) @@ -363,6 +365,7 @@ KRB5_LIB = -lkrb5 K5CRYPTO_LIB = -lk5crypto COM_ERR_LIB = -lcom_err GSS_KRB5_LIB = -lgssapi_krb5 +SUPPORT_LIB = -l$(SUPPORT_LIBNAME) # KRB4_LIB is -lkrb4 if building --with-krb4 # needs fixing if ever used on Mac OS X! @@ -375,7 +378,7 @@ DES425_LIB = @DES425_LIB@ # HESIOD_LIBS is -lhesiod... HESIOD_LIBS = @HESIOD_LIBS@ -KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(GEN_LIB) $(LIBS) +KRB5_BASE_LIBS = $(KRB5_LIB) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(GEN_LIB) $(LIBS) KRB4COMPAT_LIBS = $(KRB4_LIB) $(DES425_LIB) $(KRB5_BASE_LIBS) KDB5_LIBS = $(KDB5_LIB) $(KDB5_DB_LIB) GSS_LIBS = $(GSS_KRB5_LIB) |