Merge pull request #324 from seanupton/master

Add respective paths for C_INCLUDE_PATH, LD_RUN_PATH (rpath) to build if...
python-pillow · Aug 26, 2013 · 79302b9 · 79302b9
2 parents 588e6f8 + 1869ed5
commit 79302b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,10 @@ Changelog (Pillow)
 2.2.0 (2013-10-01)
 ------------------
 
+- Add respective paths for C_INCLUDE_PATH, LD_RUN_PATH (rpath) to build
+  if specified as environment variables.
+  [seanupton]
+
 - Fix Issue #312 + gif optimize improvement
   [d-schmidt]
 

diff --git a/setup.py b/setup.py
@@ -196,6 +196,12 @@ def build_extensions(self):
         _add_directory(library_dirs, "/usr/local/lib")
         # FIXME: check /opt/stuff directories here?
 
+        # include, rpath, if set as environment variables:
+        if os.environ.get('C_INCLUDE_PATH'):
+            _add_directory(include_dirs, os.environ.get('C_INCLUDE_PATH'))
+        if os.environ.get('LD_RUN_PATH'):
+            _add_directory(library_dirs, os.environ.get('LD_RUN_PATH'))
+
         prefix = sysconfig.get_config_var("prefix")
         if prefix:
             _add_directory(library_dirs, os.path.join(prefix, "lib"))