From: Tom Yu <tlyu@mit.edu>
Date: Wed, 15 Nov 2006 03:00:16 +0000 (+0000)
Subject: pull up r18791 from trunk
X-Git-Tag: krb5-1.6-alpha1~3
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=4483eb11330f1ee84978cb94f7fe66ba0a313987;p=krb5.git

pull up r18791 from trunk

 r18791@cathode-dark-space:  rra | 2006-11-09 17:56:39 -0500
 ticket: 2240
 Component: krb5-libs
 Version_Reported: 1.3.2
 Target_Version: 1.6
 Tags: pullup

 Install gssapi.h in includedir that includes gssapi/gssapi.h so that either
 form of #include will work.  Provides better compatibility with Heimdal.


ticket: 2240
version_fixed: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18806 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 02e7b5e9f..47bdce823 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -126,3 +126,4 @@ install-headers-unix install:: krb5/krb5.h profile.h
 	$(INSTALL_DATA) krb5/krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)krb5.h
 	$(INSTALL_DATA) $(srcdir)/krb5/locate_plugin.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5$(S)locate_plugin.h
 	$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h
+	$(INSTALL_DATA) $(srcdir)/gssapi.h $(DESTDIR)$(KRB5_INCDIR)$(S)gssapi.h
diff --git a/src/include/gssapi.h b/src/include/gssapi.h
new file mode 100644
index 000000000..f55768144
--- /dev/null
+++ b/src/include/gssapi.h
@@ -0,0 +1,5 @@
+/* 
+ * Wrapper so that #include <gssapi.h> will work without special include
+ * paths.
+ */
+#include <gssapi/gssapi.h>