summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2010-04-21 21:47:45 (GMT)
committerMatthias Klose <doko@ubuntu.com>2010-04-21 21:47:45 (GMT)
commit5a204fed7e14aa864de1bd24daf95656eee07d96 (patch)
treea340c24276b4e719fa9b459338c554dde8053260
parentfec12fff0f49275e0f7e2d52a689a709db41c0c1 (diff)
downloadcpython-5a204fed7e14aa864de1bd24daf95656eee07d96.zip
cpython-5a204fed7e14aa864de1bd24daf95656eee07d96.tar.gz
cpython-5a204fed7e14aa864de1bd24daf95656eee07d96.tar.bz2
Merged revisions 80320 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r80320 | matthias.klose | 2010-04-21 23:45:30 +0200 (Mi, 21 Apr 2010) | 2 lines setup.py: search ffi.h in include dirs, if LIBFFI_INCLUDEDIR is empty. ........
-rw-r--r--setup.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 846940d..ada6ca4 100644
--- a/setup.py
+++ b/setup.py
@@ -1583,7 +1583,7 @@ class PyBuildExt(build_ext):
inc_dirs.append('/usr/include/ffi')
ffi_inc = [sysconfig.get_config_var("LIBFFI_INCLUDEDIR")]
- if not ffi_inc:
+ if not ffi_inc or ffi_inc[0] == '':
ffi_inc = find_file('ffi.h', [], inc_dirs)
if ffi_inc is not None:
ffi_h = ffi_inc[0] + '/ffi.h'