From c79f83712cf4731847021b9d96d8459ecf755cac Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 22 Jan 2010 02:00:27 +0000
Subject: Fix gssapi.h compiler warning on FreeBSD...

...and only include gssapi.h if we're not including gssapi/gssapi.h.

svn path=/branches/BRANCH_6-3/; revision=5461
---
 NEWS     | 4 ++++
 gssapi.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 8ef8abc7..92e130f2 100644
--- a/NEWS
+++ b/NEWS
@@ -59,6 +59,10 @@ fetchmail 6.3.14 (not yet released):
   improving overall robustness of the IMAP client), bug report and testing by
   Matt Doran, with further hints from Timo Sirainen.
 
+# CHANGES
+* Only include gssapi.h if we're not including gssapi/gssapi.h, to fix a FreeBSD
+  compiler warning about gssapi.h being obsolete.
+
 # DOCUMENTATION
 * The README.SSL document was revised for grammar, spelling, and clarity.
   Courtesy of Robert Mullin.
diff --git a/gssapi.c b/gssapi.c
index 883f748f..1b294bab 100644
--- a/gssapi.c
+++ b/gssapi.c
@@ -24,7 +24,7 @@
 #  ifdef HAVE_GSS_H
 #    include <gss.h>
 #  else
-#  ifdef HAVE_GSSAPI_H
+#  if defined(HAVE_GSSAPI_H) && !defined(HAVE_GSSAPI_GSSAPI_H)
 #    include <gssapi.h>
 #  endif
 #  ifdef HAVE_GSSAPI_GSSAPI_H
-- 
cgit v1.2.3