--- cyrus-sasl-2.1.27/m4/sasl2.m4.orig	2011-09-17 07:31:51.000000000 +0200
+++ cyrus-sasl-2.1.27/m4/sasl2.m4	2011-09-17 08:24:54.480760162 +0200
@@ -221,11 +221,25 @@
   elif test "$ac_cv_header_gssapi_h" = "yes"; then
     AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-                               [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
+                               [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])],
+                    [AC_EGREP_CPP(hostbased_service_gss_nt_yes,
+                                  [#include <gssapi.h>
+                                   #ifdef GSS_C_NT_HOSTBASED_SERVICE
+                                     hostbased_service_gss_nt_yes
+                                   #endif],
+                                   [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
+                                              [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])])
   elif test "$ac_cv_header_gssapi_gssapi_h"; then
     AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi/gssapi.h,
                     [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-                               [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
+                               [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])],
+                    [AC_EGREP_CPP(hostbased_service_gss_nt_yes,
+                                  [#include <gssapi/gssapi.h>
+                                   #ifdef GSS_C_NT_HOSTBASED_SERVICE
+                                     hostbased_service_gss_nt_yes
+                                   #endif],
+                                   [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
+                                              [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])])
   fi
 
   if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
@@ -240,13 +254,27 @@
   elif test "$ac_cv_header_gssapi_h" = "yes"; then
     AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
                     [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-                               [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])])
+                               [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])],
+                    [AC_EGREP_CPP(user_name_yes_gss_nt,
+                                  [#include <gssapi.h>
+                                   #ifdef GSS_C_NT_USER_NAME
+                                     user_name_yes_gss_nt
+                                   #endif],
+                                   [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
+                                              [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])])])
     AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi.h, rfc5587=yes)
     AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes)
   elif test "$ac_cv_header_gssapi_gssapi_h"; then
     AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi/gssapi.h,
                     [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
-                               [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])])
+                               [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])],
+                    [AC_EGREP_CPP(user_name_yes_gss_nt,
+                                  [#include <gssapi/gssapi.h>
+                                   #ifdef GSS_C_NT_USER_NAME
+                                     user_name_yes_gss_nt
+                                   #endif],
+                                   [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
+                                              [Define if your GSSAPI implementation defines GSS_C_NT_USER_NAME])])])
     AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi/gssapi.h, rfc5587=yes)
     AC_EGREP_HEADER(gss_inquire_mech_for_saslname, gssapi.h, rfc5801=yes)
   fi