Okay, two bugs here. One's an oversight of mine in my previous patch,

where I tried to use "[hH]" as Bourne code while m4 had quoting set to
([, ]) -- this probably makes mutt mis-detect Heimdal after all.

The other is not mine (i.e., it's in cvs now) and it makes mutt
overstrike $LIBS if Heimdal or MIT Kerberos is detected. This is a
problem for anyone who needs -lnsl -lsocket, in particular. I was
fixing
this by hand during late 1.3.x releases, as I didn't have time to
track
it down....

Here's a patch against the current (unpatched) 1.5 cvs copy of
m4/gssapi.m4. It probably should go into both branches. Sorry for the
repeats.

diff --git a/m4/gssapi.m4 b/m4/gssapi.m4
index 31382157a67a060c6597f316272a0d35a577d2d3..5c01b8111560b860035a06b73ef3d75c45f9621d 100644 (file)
--- a/m4/gssapi.m4
+++ b/m4/gssapi.m4
@@ -10,6 +10,9 @@ AC_DEFUN(MUTT_AM_PATH_GSSAPI,
 [
   GSSAPI_PREFIX=[$]$1
   GSSAPI_IMPL="none"
+  saved_CPPFLAGS="$CPPFLAGS"
+  saved_LDFLAGS="$LDFLAGS"
+  saved_LIBS="$LIBS"
   dnl First try krb5-config
   if test "$GSSAPI_PREFIX" != "yes"
   then
@@ -22,12 +25,13 @@ AC_DEFUN(MUTT_AM_PATH_GSSAPI,
   then
     GSSAPI_CFLAGS="$CPPFLAGS `$KRB5CFGPATH --cflags gssapi`"
     GSSAPI_LIBS="$MUTTLIBS `$KRB5CFGPATH --libs gssapi`"
-    GSSAPI_IMPL="Heimdal"
+    case "`$KRB5CFGPATH --version`" in
+      "Kerberos 5 "*)  GSSAPI_IMPL="MIT";;
+      ?eimdal*)                GSSAPI_IMPL="Heimdal";;
+      *)               GSSAPI_IMPL="Unknown";;
+   esac
   else
     dnl No krb5-config, run the old code
-    saved_CPPFLAGS="$CPPFLAGS"
-    saved_LDFLAGS="$LDFLAGS"
-    saved_LIBS="$LIBS"
     if test "$GSSAPI_PREFIX" != "yes"
     then
       GSSAPI_CFLAGS="-I$GSSAPI_PREFIX/include"
@@ -70,4 +74,4 @@ AC_DEFUN(MUTT_AM_PATH_GSSAPI,
   CPPFLAGS="$saved_CPPFLAGS"
   LDFLAGS="$saved_LDFLAGS"
   LIBS="$saved_LIBS"
-])
\ No newline at end of file
+])