[Python-checkins] cpython (3.2): Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.

[ned.deily]

http://hg.python.org/cpython/rev/eb0af7f6ea6d
changeset:   78331:eb0af7f6ea6d
branch:      3.2
parent:      78327:17ddc0c34d9d
user:        Ned Deily <nad at acm.org>
date:        Mon Jul 30 04:09:32 2012 -0700
summary:
  Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.

files:
  Misc/NEWS |  2 ++
  setup.py  |  3 +++
  2 files changed, 5 insertions(+), 0 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -435,6 +435,8 @@
 - Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.
   Based on patch from Hervé Coatanhay.
 
+- Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
+
 Documentation
 -------------
 
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,9 @@
     Returns True if 'path' can be located in an OSX SDK
     """
     return (path.startswith('/usr/') and not path.startswith('/usr/local')) or path.startswith('/System/')
+    return ( (path.startswith('/usr/') and not path.startswith('/usr/local'))
+                or path.startswith('/System/')
+                or path.startswith('/Library/') )
 
 def find_file(filename, std_dirs, paths):
     """Searches for the directory where a given file is located,

-- 
Repository URL: http://hg.python.org/cpython