From 2a01014f8feed4c4b89bc9c92d48ce2a6ae16405 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 18 May 2005 11:50:09 +0000
Subject: r6879: Another attempt at including the 'right' kerberos headers on
 dual-install systems.

Andrew Bartlett
(This used to be commit efc24f1a4592270634dca253689c1b54e154d8b8)
---
 source4/include/system/kerberos.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'source4')

diff --git a/source4/include/system/kerberos.h b/source4/include/system/kerberos.h
index 28ff260438..e0a926300f 100644
--- a/source4/include/system/kerberos.h
+++ b/source4/include/system/kerberos.h
@@ -28,17 +28,20 @@
 #endif
 
 #if defined(HAVE_GSSAPI_H)
-#include <gssapi.h>
+# include <gssapi.h>
+# ifdef HAVE_GSSAPI_KRB5_H
+#  include <gssapi_krb5.h>
+# endif
 #elif defined(HAVE_GSSAPI_GSSAPI_H)
-#include <gssapi/gssapi.h>
+# include <gssapi/gssapi.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#  include <gssapi/gssapi_krb5.h>
+# endif
 #elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
-#include <gssapi/gssapi_generic.h>
-#endif
-
-#ifdef HAVE_GSSAPI_KRB5_H
-#include <gssapi_krb5.h>
-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
-#include <gssapi/gssapi_krb5.h>
+# include <gssapi/gssapi_generic.h>
+# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
+#  include <gssapi/gssapi_krb5.h>
+# endif
 #endif
 
 #ifdef HAVE_COM_ERR_H
-- 
cgit