Fix GSS extension tests and headers for Heimdal/GNU

[shibboleth/cpp-sp-resolver.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 711e607..eba8497 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -386,8 +386,7 @@ if test x"$want_gss" = xyes; then
        LDFLAGS="$LDFLAGS -L$GSSAPI_ROOT/lib$libsuff"
     fi
     if test -f "$GSSAPI_ROOT/bin/krb5-config"; then
-      dnl krb5-config doesn't have --libs-only-L or similar, put everything
-      dnl into LIBS
+      dnl krb5-config does not have --libs-only-L or similar, put everything into LIBS
       gss_libs=`$GSSAPI_ROOT/bin/krb5-config --libs gssapi`
     else
       if test "x$not_mit" = "x1"; then
@@ -401,9 +400,16 @@ if test x"$want_gss" = xyes; then
 
   AC_MSG_CHECKING([whether GSS-API naming extensions are available])
   AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM([[#include <gssapi/gssapi_ext.h>]],
+    [AC_LANG_PROGRAM([[
+#ifdef SHIBRESOLVER_HAVE_GSSGNU
+# include <gss.h>
+#elif defined SHIBRESOLVER_HAVE_GSSMIT
+# include <gssapi/gssapi_ext.h>
+#else
+# include <gssapi.h>
+#endif]],
     [[gss_get_name_attribute(NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);]])],
-    [AC_MSG_RESULT([yes])AC_DEFINE([HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
+    [AC_MSG_RESULT([yes])AC_DEFINE([SHIBRESOLVER_HAVE_GSSAPI_NAMINGEXTS],[1],[Define to 1 if GSS-API naming extensions are available.])],
     [AC_MSG_RESULT([no])])
 
 else