From 7af43da6ba1dac4751dd7c9b0e71952fcc2f900b Mon Sep 17 00:00:00 2001
From: "darin%meer.net" <darin%meer.net>
Date: Tue, 6 Apr 2004 16:29:18 +0000
Subject: [PATCH] fixes bug 237578 "GSS_C_NT_HOSTBASED_SERVICE not found even
 though it should be" r+sr=bryner a=chofmann

---
 configure.in                                  | 8 +++++++-
 extensions/negotiateauth/nsHttpGssapiAuth.cpp | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index 5393812bb3e1..e4956c1c4670 100644
--- a/configure.in
+++ b/configure.in
@@ -3876,8 +3876,14 @@ if test `echo "$MOZ_EXTENSIONS" | grep -c negotiateauth` -ne 0; then
         dnl Try to determine if the GSS_C_NT_HOSTBASED_SERVICE value is
         dnl defined.  Older MIT releases did not define this correctly.
         dnl
+        AC_CHECK_HEADERS([gssapi_generic.h])
         AC_CHECK_HEADERS([gssapi/gssapi_generic.h])
-        AC_TRY_COMPILE([ #include <gssapi/gssapi.h> ],
+
+        AC_TRY_COMPILE([ #if defined(HAVE_GSSAPI_H)
+                         #include <gssapi.h>
+                         #elif defined(HAVE_GSSAPI_GSSAPI_H)
+                         #include <gssapi/gssapi.h>
+                         #endif ],
             [ gss_OID oid = GSS_C_NT_HOSTBASED_SERVICE; ],
             [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE)],[
              AC_MSG_WARN([GSS_C_NT_HOSTBASED_SERVICE not found])
diff --git a/extensions/negotiateauth/nsHttpGssapiAuth.cpp b/extensions/negotiateauth/nsHttpGssapiAuth.cpp
index 1ef4278b5fd6..cfe4fd304169 100644
--- a/extensions/negotiateauth/nsHttpGssapiAuth.cpp
+++ b/extensions/negotiateauth/nsHttpGssapiAuth.cpp
@@ -62,7 +62,9 @@
 #include <gssapi/gssapi.h>
 #endif
 
-#if defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
+#if defined(HAVE_GSSAPI_GENERIC_H)
+#include <gssapi_generic.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
 #include <gssapi/gssapi_generic.h> 
 #endif