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

diff --git a/NEWS b/NEWS
index 8ef8abc7a9e52fb4d96f75a6ad523ad57388bd46..92e130f2c988134de23a7f8aa900ad0c5e840e03 100644 (file)
--- 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 883f748fdffc5e4301500e106b148e005a8aafb9..1b294bab1f71d5133a74c1c2618f086dc988a15f 100644 (file)
--- 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