diff setup.py @ 60820:8e4247411754

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. ........
author Matthias Klose <doko@ubuntu.com>
date Wed, 21 Apr 2010 21:47:45 +0000
parents 9aac1d3d873d
children a3ce275bf095
line wrap: on
line diff
--- a/setup.py	Wed Apr 21 19:46:23 2010 +0000
+++ b/setup.py	Wed Apr 21 21:47:45 2010 +0000
@@ -1583,7 +1583,7 @@
             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'