diff options
| author | Ezra Peisach <epeisach@mit.edu> | 1995-12-06 01:51:08 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 1995-12-06 01:51:08 +0000 |
| commit | 086dcc6c120ee1dee579639a3ccfa3431a0a9ccd (patch) | |
| tree | ac8ac0aaeb3dd4f733127c86363bef13019e96b9 /src | |
| parent | 350a6a210a32ca99ca03529bd705f2cc673ded81 (diff) | |
| download | krb5-086dcc6c120ee1dee579639a3ccfa3431a0a9ccd.tar.gz krb5-086dcc6c120ee1dee579639a3ccfa3431a0a9ccd.tar.xz krb5-086dcc6c120ee1dee579639a3ccfa3431a0a9ccd.zip | |
Add USE_KRB5UTIL_LIBRARY. Change library link order to -lkrb4 -lkrb5
compat_recvauth is moving to a new library and krb4 now depends on krb5
anyways for the configurable path support.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7171 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/aclocal.m4 | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c031852ca..770e046a3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 5 20:48:56 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> + + * aclocal.m4 (kutil_lib): Add USE_KRB5UTIL_LIBRARY. Change + library link order to -lkrb4 -lkrb5. + Sun Nov 12 04:40:02 1995 Mark W. Eichin <eichin@cygnus.com> * Makefile.in (install-mkdirs): bash needs a semicolon between fi diff --git a/src/aclocal.m4 b/src/aclocal.m4 index a464f427a..c34553fcf 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -754,7 +754,7 @@ ADD_DEF(-Dvolatile=) fi ])dnl dnl -dnl This rule tells KRB5_LIBRARIES to use the kadm librarh. +dnl This rule tells KRB5_LIBRARIES to use the kadm library. dnl kadm_deplib='' kadm_lib='' @@ -762,6 +762,14 @@ define(USE_KADM_LIBRARY,[ kadm_deplib="\[$](TOPLIBD)/libkadm.a" kadm_lib=-lkadm]) dnl +dnl This rule tells KRB5_LIBRARIES to use the krb5util library. +dnl +kutil_deplib='' +kutil_lib='' +define(USE_KRB5UTIL_LIBRARY,[ +kutil_deplib="\[$](TOPLIBD)/libkrb5util.a" +kutil_lib=-lkrb5util]) +dnl dnl This rule tells KRB5_LIBRARIES to include the kdb5 library. dnl kdb5_deplib='' @@ -798,8 +806,8 @@ dnl dnl This rule generates library lists for programs. dnl define(KRB5_LIBRARIES,[ -DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadm_deplib $kdb5_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib \[$](TOPLIBD)/libcom_err.a" -LIBS="\[$](LOCAL_LIBRARIES) $kadm_lib $kdb5_lib -lkrb5 $kdb4_lib $krb4_lib -lcrypto $ss_lib -lcom_err $LIBS" +DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadm_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $kdb4_deplib $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib \[$](TOPLIBD)/libcom_err.a" +LIBS="\[$](LOCAL_LIBRARIES) $kadm_lib $kdb5_lib $kdb4_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib -lcom_err $LIBS" LDFLAGS="$LDFLAGS -L\$(TOPLIBD)" AC_SUBST(LDFLAGS) AC_SUBST(LDARGS) |