--- dovecot-1.0.1/configure.in	Thu Jun 14 14:01:28 2007
+++ dovecot-1.0.1-ifm/configure.in	Mon Jul  2 17:45:47 2007
@@ -1484,10 +1484,15 @@
 			# have gssapi.h
 			old_CFLAGS=$CFLAGS
 			CFLAGS="$CFLAGS `krb5-config --cflags gssapi`"
+			old_LIBS=$LIBS
+			LIBS="$LIBS `krb5-config --libs gssapi`"
 			AC_CHECK_HEADER([gssapi/gssapi.h], [
 				AC_DEFINE(HAVE_GSSAPI_GSSAPI_H,, GSSAPI headers in gssapi/gssapi.h)
 				have_gssapi=yes
 			])
+			AC_CHECK_HEADER([gssapi/gssapi_ext.h], [
+				AC_DEFINE(HAVE_GSSAPI_GSSAPI_EXT_H,, GSSAPI headers in gssapi/gssapi_ext.h)
+			])
 			AC_CHECK_HEADER([gssapi.h], [
 				AC_DEFINE(HAVE_GSSAPI_H,, GSSAPI headers in gssapi.h)
 				have_gssapi=yes
@@ -1494,8 +1499,13 @@
 			])
 			if test $have_gssapi = yes; then
 				AC_DEFINE(HAVE_GSSAPI,, Build with GSSAPI support)
+				AC_CHECK_LIB(gss, __gss_userok, [
+					AC_DEFINE(HAVE___GSS_USEROK,,
+						Define if you have __gss_userok())
+				])
 			fi
 			CFLAGS=$old_CFLAGS
+			LIBS=$old_LIBS
 		fi
 	fi
 fi