pull up r17581 from trunk

ticket: 3320
version_fixed: 1.4.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17720 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 0b0b6e29179fbda429ed53809cc0023bfacde9c7..679ae5a9a581684a36e0a04e93e7c676562e2b2a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-06  Tom Yu  <tlyu@mit.edu>
+
+       * krb5-config.in: Cause libs output to match actual required
+       ordering of libraries.
+
 2005-11-29  Jeffrey Altman <jaltman@mit.edu>
 
        * Makefile.in: add src/windows/kfwlogon tree

diff --git a/src/krb5-config.in b/src/krb5-config.in
index b0d8c0c07e2d96d2698ca156b47b4f0682bf1772..dc9baa465eb4383d9fbcdcec612e89897c350982 100755 (executable)
--- a/src/krb5-config.in
+++ b/src/krb5-config.in
@@ -212,7 +212,7 @@ if test -n "$do_libs"; then
     fi
 
     if test $library = 'krb5'; then
-       lib_flags="$lib_flags -lkrb5 -lk5crypto -lkrb5support -lcom_err $LIBS $GEN_LIB"
+       lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err -lkrb5support $GEN_LIB $LIBS"
     fi
 
     echo $lib_flags