[CalendarServer-changes] [202] PyKerberos/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 26 13:23:18 PDT 2006
Revision: 202
http://trac.macosforge.org/projects/collaboration/changeset/202
Author: wsanchez at apple.com
Date: 2006-09-26 13:23:18 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
Use standard Kerberos include paths.
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-26 20:11:16 UTC (rev 201)
+++ PyKerberos/trunk/setup.py 2006-09-26 20:23:18 UTC (rev 202)
@@ -20,6 +20,12 @@
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",
@@ -29,6 +35,7 @@
"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-26 20:11:16 UTC (rev 201)
+++ PyKerberos/trunk/src/kerberosbasic.h 2006-09-26 20:23:18 UTC (rev 202)
@@ -16,9 +16,9 @@
* DRI: Cyrus Daboo, cdaboo at apple.com
**/
-#include <Kerberos/gssapi.h>
-#include <Kerberos/gssapi_generic.h>
-#include <Kerberos/gssapi_krb5.h>
+#include <gssapi.h>
+#include <gssapi_generic.h>
+#include <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-26 20:11:16 UTC (rev 201)
+++ PyKerberos/trunk/src/kerberosgss.h 2006-09-26 20:23:18 UTC (rev 202)
@@ -16,9 +16,9 @@
* DRI: Cyrus Daboo, cdaboo at apple.com
**/
-#include <Kerberos/gssapi.h>
-#include <Kerberos/gssapi_generic.h>
-#include <Kerberos/gssapi_krb5.h>
+#include <gssapi.h>
+#include <gssapi_generic.h>
+#include <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/20060926/34b4f5de/attachment.html
More information about the calendarserver-changes
mailing list