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

diff --git a/src/ChangeLog b/src/ChangeLog
index c031852cadef947fae8b630a8c9ec774e5430b8a..770e046a371edaf79a6e8eaf9f72fd673f050fe5 100644 (file)
--- 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 a464f427ad599b19ea8a0a0a163b68b447b35b17..c34553fcf8fc3e8753e4b427bd0ab05f9ccad634 100644 (file)
--- 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)