- (dtucker) [configure.ac gss-serv-krb5.c ssh-gss.h] Define GSSAPI when found

   with krb5-config, hunt down gssapi.h and friends.  Based partially on patch
   from deengert at anl.gov.

For the MIT Kerberos bug against krb5-config related to this see:
http://krbdev.mit.edu/rt/Ticket/Display.html?id=2240

1 files changed, 10 insertions, 2 deletions

diff --git a/ssh-gss.h b/ssh-gss.h
index 2b6fe2130..4f032aa8f 100644
--- a/ssh-gss.h
+++ b/ssh-gss.h
@@ -30,11 +30,19 @@
 
 #include "buffer.h"
 
+#ifdef HAVE_GSSAPI_H
 #include <gssapi.h>
+#elif defined(HAVE_GSSAPI_GSSAPI_H)
+#include <gssapi/gssapi.h>
+#endif
 
 #ifdef KRB5
-#ifndef HEIMDAL
-#include <gssapi_generic.h>
+# ifndef HEIMDAL
+#  ifdef HAVE_GSSAPI_GENERIC_H
+#   include <gssapi_generic.h>
+#  elif defined(HAVE_GSSAPI_GSSAPI_GENERIC_H)
+#   include <gssapi/gssapi_generic.h>
+#  endif
 
 /* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */