X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=cmulocal%2Fsasl2.m4;h=9c03e73af1f22652049450c80d01c2d2330b4ec2;hb=4f521b66718754941617a28da164d1daa3b9041c;hp=de4d77c5e8111f50f033b50e65570ce421f5f9d3;hpb=625251c87a9ea29d6dd6a67f558d47448100e217;p=cyrus-sasl.git

diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4
index de4d77c..9c03e73 100644
--- a/cmulocal/sasl2.m4
+++ b/cmulocal/sasl2.m4
@@ -70,7 +70,7 @@ if test "$gssapi" != no; then
                              [Define if you have the gssapi.h header file])],
                   [AC_CHECK_HEADER([gssapi/gssapi.h],,
                                    [AC_WARN([Disabling GSSAPI - no include files found]); gssapi=no])])
-
+  AC_CHECK_HEADERS(gssapi/gssapi_ext.h)
   CPPFLAGS=$cmu_saved_CPPFLAGS
 
 fi
@@ -239,10 +239,12 @@ if test "$gssapi" != "no"; then
     AC_EGREP_HEADER(GSS_C_NT_USER_NAME, gssapi.h,
                     [AC_DEFINE(HAVE_GSS_C_NT_USER_NAME,,
                                [Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME])])
+    AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi.h, rfc5587=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 implimentation defines GSS_C_NT_USER_NAME])])
+    AC_EGREP_HEADER(gss_inquire_attrs_for_mech, gssapi/gssapi.h, rfc5587=yes)
   fi
 fi
 
@@ -254,7 +256,11 @@ if test "$gssapi" != no; then
   SASL_MECHS="$SASL_MECHS libgssapiv2.la"
   SASL_STATIC_OBJS="$SASL_STATIC_OBJS gssapi.o"
   SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gssapi.c"
-
+  if test "$rfc5587" = "yes"; then
+    SASL_MECHS="$SASL_MECHS libgs2.la"
+    SASL_STATIC_OBJS="$SASL_STATIC_OBJS gs2.o"
+    SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gs2.c"
+  fi
   cmu_save_LIBS="$LIBS"
   LIBS="$LIBS $GSSAPIBASE_LIBS"
   AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)