From 40c2c3270db9c33e22d219148c660f63c3ddf3ca Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Wed, 11 Nov 2009 21:15:34 +0000
Subject: - Marco Maggi reported that compilation failed when configured
 --with-gssapi   and GNU GSS installed due to a missing mutual exclusion of
 header files in   the Kerberos 5 code path. He also verified that my patch
 worked for him.

---
 lib/krb5.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'lib/krb5.c')

diff --git a/lib/krb5.c b/lib/krb5.c
index e76391228..36afc3c46 100644
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -46,14 +46,17 @@
 #include <netdb.h>
 #endif
 #include <string.h>
-#ifdef HAVE_GSSMIT
-/* MIT style */
-#include <gssapi/gssapi.h>
-#include <gssapi/gssapi_generic.h>
-#include <gssapi/gssapi_krb5.h>
+
+#ifdef HAVE_GSSGNU
+#  include <gss.h>
+#elif defined HAVE_GSSMIT
+   /* MIT style */
+#  include <gssapi/gssapi.h>
+#  include <gssapi/gssapi_generic.h>
+#  include <gssapi/gssapi_krb5.h>
 #else
-/* Heimdal-style */
-#include <gssapi.h>
+   /* Heimdal-style */
+#  include <gssapi.h>
 #endif
 
 #include "urldata.h"
-- 
cgit v1.2.1