From 9a00cf769d523b392ede9e7ef5f00d78d167fe17 Mon Sep 17 00:00:00 2001 From: Aron Rosenberg Date: Wed, 16 Oct 2013 11:56:21 -0700 Subject: [PATCH 1/2] Add Xquartz path to Mac search directory. Fixes 10.9 Mavericks clean install issue --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 6c677bbd3..343fa102d 100644 --- a/setup.py +++ b/setup.py @@ -174,6 +174,9 @@ class pil_build_ext(build_ext): # darwin ports installation directories _add_directory(library_dirs, "/opt/local/lib") _add_directory(include_dirs, "/opt/local/include") + # xquartz installation directories + _add_directory(library_dirs, "/opt/X11/lib") + _add_directory(include_dirs, "/opt/X11/include") # freetype2 ships with X11 _add_directory(library_dirs, "/usr/X11/lib") _add_directory(include_dirs, "/usr/X11/include") From d14a1372ab0719340ea97833e8455ce924406be8 Mon Sep 17 00:00:00 2001 From: Aron Rosenberg Date: Wed, 16 Oct 2013 13:36:26 -0700 Subject: [PATCH 2/2] Set Mavericks X11 include path only --- setup.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 343fa102d..5ddf63f89 100644 --- a/setup.py +++ b/setup.py @@ -174,8 +174,7 @@ class pil_build_ext(build_ext): # darwin ports installation directories _add_directory(library_dirs, "/opt/local/lib") _add_directory(include_dirs, "/opt/local/include") - # xquartz installation directories - _add_directory(library_dirs, "/opt/X11/lib") + # Mavericks has X11 include files here _add_directory(include_dirs, "/opt/X11/include") # freetype2 ships with X11 _add_directory(library_dirs, "/usr/X11/lib")