X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configure;h=0dc2660add06ea083d70f2d533bf8e25f75c7766;hb=a9a492a18d255179bf16a27e61c3923befcc5a64;hp=e42afadba1fcec12546e6b54ad2e72b45be79133;hpb=951e7200ab57790562ba0b9780e7338b9a0ebe64;p=cyrus-sasl.git

diff --git a/configure b/configure
index e42afad..0dc2660 100755
--- a/configure
+++ b/configure
@@ -1899,6 +1899,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 if test $cache_file = "/dev/null"; then
 cache_file="./config.cache"
 if test -r "$cache_file"; then
@@ -19002,6 +19003,21 @@ _ACEOF
 fi
 rm -f -r conftest*
 
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <gssapi.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "gss_inquire_attrs_for_mech" >/dev/null 2>&1; then
+  rfc5587=yes
+fi
+rm -f -r conftest*
+
   elif test "$ac_cv_header_gssapi_gssapi_h"; then
     cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -19022,6 +19038,21 @@ _ACEOF
 fi
 rm -f -r conftest*
 
+    cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <gssapi/gssapi.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "gss_inquire_attrs_for_mech" >/dev/null 2>&1; then
+  rfc5587=yes
+fi
+rm -f -r conftest*
+
   fi
 fi
 
@@ -19096,10 +19127,14 @@ if test $ac_cv_lib_resolv_res_search = yes; then
   GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
 fi
 
-  SASL_MECHS="$SASL_MECHS libgs2.la libgssapiv2.la"
-  SASL_STATIC_OBJS="$SASL_STATIC_OBJS gs2.o gssapi.o"
-  SASL_STATIC_SRCS="$SASL_STATIC_SRCS ../plugins/gs2.c ../plugins/gssapi.c"
-
+  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"