Merge pull request #3477 from cimarronm/setupext_check_for_libpng

tacaswell · tacaswell · commit ef2ea6ad8e1e · 2014-09-12T08:51:14.000-04:00
BLD : Better check for required dependency libpng
diff --git a/setupext.py b/setupext.py
@@ -1014,8 +1014,11 @@ def check(self):
                 'libpng', 'png.h',
                 min_version='1.2', version=version)
         except CheckFailed as e:
-            self.__class__.found_external = False
-            return str(e) + ' Using unknown version.'
+            include_dirs = [
+                os.path.join(dir, 'include') for dir in get_base_dirs()]
+            if has_include_file(include_dirs, 'png.h'):
+                return str(e) + ' Using unknown version found on system.'
+            raise
 
     def get_extension(self):
         sources = [
