[CalendarServer-changes] [217] PyKerberos/trunk

[source_changes at macosforge.org]

Revision: 217
          http://trac.macosforge.org/projects/calendarserver/changeset/217
Author:   wsanchez at apple.com
Date:     2006-09-28 11:47:50 -0700 (Thu, 28 Sep 2006)

Log Message:
-----------
Prefix GSSAPI includes with "gssapi/".

Modified Paths:
--------------
    PyKerberos/trunk/setup.py
    PyKerberos/trunk/src/kerberosbasic.h
    PyKerberos/trunk/src/kerberosgss.h

Modified: PyKerberos/trunk/setup.py
===================================================================
--- PyKerberos/trunk/setup.py	2006-09-28 00:56:30 UTC (rev 216)
+++ PyKerberos/trunk/setup.py	2006-09-28 18:47:50 UTC (rev 217)
@@ -20,12 +20,6 @@
 import sys
 import commands
 
-if sys.platform == "darwin":
-    # krb5-config --cflags is broken on OS X
-    include_dirs = ["/System/Library/Frameworks/Kerberos.framework/Versions/Current/Headers"]
-else:
-    include_dirs = []
-
 setup (
     name = "kerberos",
     version = "1.0",
@@ -35,7 +29,6 @@
             "kerberos",
             extra_link_args = commands.getoutput("krb5-config --libs gssapi").split(),
             extra_compile_args = commands.getoutput("krb5-config --cflags gssapi").split(),
-            include_dirs = include_dirs,
             sources = [
                 "src/kerberos.c",
                 "src/kerberosbasic.c",

Modified: PyKerberos/trunk/src/kerberosbasic.h
===================================================================
--- PyKerberos/trunk/src/kerberosbasic.h	2006-09-28 00:56:30 UTC (rev 216)
+++ PyKerberos/trunk/src/kerberosbasic.h	2006-09-28 18:47:50 UTC (rev 217)
@@ -16,9 +16,9 @@
  * DRI: Cyrus Daboo, cdaboo at apple.com
  **/
 
-#include <gssapi.h>
-#include <gssapi_generic.h>
-#include <gssapi_krb5.h>
+#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_generic.h>
+#include <gssapi/gssapi_krb5.h>
 
 #define krb5_get_err_text(context,code) error_message(code)
 

Modified: PyKerberos/trunk/src/kerberosgss.h
===================================================================
--- PyKerberos/trunk/src/kerberosgss.h	2006-09-28 00:56:30 UTC (rev 216)
+++ PyKerberos/trunk/src/kerberosgss.h	2006-09-28 18:47:50 UTC (rev 217)
@@ -16,9 +16,9 @@
  * DRI: Cyrus Daboo, cdaboo at apple.com
  **/
 
-#include <gssapi.h>
-#include <gssapi_generic.h>
-#include <gssapi_krb5.h>
+#include <gssapi/gssapi.h>
+#include <gssapi/gssapi_generic.h>
+#include <gssapi/gssapi_krb5.h>
 
 #define krb5_get_err_text(context,code) error_message(code)
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060928/2a003aa3/attachment.html