Merge branch 'master' of github.com:collective/Pillow

This commit is contained in:
Alex Clark 2011-10-26 21:12:53 -04:00
commit f170eced0b

View File

@ -111,8 +111,8 @@ class pil_build_ext(build_ext):
_add_directory(library_dirs, "/opt/local/lib")
_add_directory(include_dirs, "/opt/local/include")
# freetype2 ships with X11
_add_directory(library_dirs, "/usr/x11/lib")
_add_directory(include_dirs, "/usr/x11/include")
_add_directory(library_dirs, "/usr/X11/lib")
_add_directory(include_dirs, "/usr/X11/include")
elif sys.platform.startswith("linux"):
if platform.processor() == "x86_64":