From f41fc199281892366742e3d816aba113d0e488cf Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@padl.com>
Date: Sun, 26 Sep 2010 17:17:37 +0200
Subject: [PATCH] check for rfc5587 before building gs2

---
 build.sh          |  0
 cmulocal/sasl2.m4 | 14 ++++++++++----
 configure         | 42 ++++++++++++++++++++++++++++++++++++++----
 3 files changed, 48 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 build.sh

diff --git a/build.sh b/build.sh
old mode 100644
new mode 100755
diff --git a/cmulocal/sasl2.m4 b/cmulocal/sasl2.m4
index 85be7ed..e034ae5 100644
--- a/cmulocal/sasl2.m4
+++ b/cmulocal/sasl2.m4
@@ -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
 
@@ -251,10 +253,14 @@ AC_MSG_CHECKING([GSSAPI])
 if test "$gssapi" != no; then
   AC_MSG_RESULT([with implementation ${gss_impl}])
   AC_CHECK_LIB(resolv,res_search,GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv")
-  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"
   AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity)
diff --git a/configure b/configure
index 40a5f30..0dc2660 100755
--- a/configure
+++ b/configure
@@ -19003,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.  */
@@ -19023,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
 
@@ -19097,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"
 
-- 
2.1.4