Harry McGavran's fix.

svn path=/trunk/; revision=2280

diff --git a/NEWS b/NEWS
index 8f2834648599e3010db8bcc7f5cc7ffd0231589b..3e5400b44e5e50fcfabbc81b99933a3acdb9fb9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,8 +5,9 @@ fetchmail-4.7.1 ():
 * gcc -Wall cleanup.
 * Make sure user can see a trouble message in verbose mode when there 
   are no local matches for recipient addresses.
+* Harry McGavran's configure.in fix for mixed Kerberos IV/V installations.
 
-There are 246 people on fetchmail-friends and 329 on fetchmail-announce.
+There are 245 people on fetchmail-friends and 329 on fetchmail-announce.
 
 fetchmail-4.7.0 (Mon Dec 14 12:05:27 EST 1998):
 * Minor correction to make i18n subdirectory builds work better.

diff --git a/configure.in b/configure.in
index 39c81b1e96dd4c31a9ca561c7e56a407d1089a83..90b724ba7bbbb11a5d040879ce9595012346cf8b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -322,7 +322,7 @@ elif test -n "$with_kerberos" -a -n "$with_kerberos5"
 then
     CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$with_kerberos/include"
     LDEFLAGS="$LDEFLAGS -L$with_kerberos/lib"
-    LIBS="$LIBS -lkrb4"
+    LIBS="-lkrb4 -ldes425 $LIBS"
 elif test -n "$with_kerberos5"
 then
     for dir in /usr/kerberos /usr/kerberosIV /usr/athena
@@ -331,7 +331,7 @@ then
       then
         CEFLAGS="$CEFLAGS -DKERBEROS_V4 -I$dir/include"
         LDEFLAGS="$LDEFLAGS -L$dir/lib"
-        LIBS="$LIBS -lkrb4"
+       LIBS="-lkrb4 -ldes425 $LIBS"
         break
       fi
     done

diff --git a/fetchmail-FAQ.html b/fetchmail-FAQ.html
index 899ea8e5e7a34a02a4e77fe7df82e8588a232603..a4bd52422284a304d9a55c7dd40659258dc2de35 100644 (file)
--- a/fetchmail-FAQ.html
+++ b/fetchmail-FAQ.html
@@ -10,7 +10,7 @@
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1998/12/16 16:54:19 $
+<td width="30%" align=right>$Date: 1998/12/17 19:17:54 $
 </table>
 <HR>
 <H1>Frequently Asked Questions About Fetchmail</H1>
@@ -1738,6 +1738,9 @@ It would be better to fix your DNS, however.  DNS problems can hurt
 you in lots of ways, for example by making your machines
 intermittently or permanently unreachable to the rest of the net.<P>
 
+Occasionally these errors indicate the sort of header-parsing problem
+described in <a href="#M7">M7</a>.<P>
+
 <hr>
 <h2><a name="M2">M2. I can't seem to get fetchmail to route to a local domain properly.</a></h2>
 
@@ -2212,7 +2215,7 @@ Re-ordering messages is a user-agent function, anyway.<P>
 <table width="100%" cellpadding=0><tr>
 <td width="30%">Back to <a href="index.html">Fetchmail Home Page</a>
 <td width="30%" align=center>To <a href="/~esr/sitemap.html">Site Map</a>
-<td width="30%" align=right>$Date: 1998/12/16 16:54:19 $
+<td width="30%" align=right>$Date: 1998/12/17 19:17:54 $
 </table>
 
 <P><ADDRESS>Eric S. Raymond <A HREF="mailto:esr@thyrsus.com">&lt;esr@snark.thyrsus.com&gt;</A></ADDRESS>