8000 Merge pull request #3477 from cimarronm/setupext_check_for_libpng · matplotlib/matplotlib@ef2ea6a · GitHub
[go: up one dir, main page]

Skip to content

Commit ef2ea6a

Browse files
committed
Merge pull request #3477 from cimarronm/setupext_check_for_libpng
BLD : Better check for required dependency libpng
1 parent 0c7738a commit ef2ea6a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

setupext.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,8 +1014,11 @@ def check(self):
10141014
'libpng', 'png.h',
10151015
min_version='1.2', version=version)
10161016
except CheckFailed as e:
1017-
self.__class__.found_external = False
1018-
return str(e) + ' Using unknown version.'
1017+
include_dirs = [
1018+
os.path.join(dir, 'include') for dir in get_base_dirs()]
1019+
if has_include_file(include_dirs, 'png.h'):
1020+
return str(e) + ' Using unknown version found on system.'
1021+
raise
10191022

10201023
def get_extension(self):
10211024
sources = [

0 commit comments

Comments
 (0)
0