Skip to content

Commit

Permalink
Merge pull request #3278 from milljm/libpng-config
Browse files Browse the repository at this point in the history
BLD : Use libpng-config if available
  • Loading branch information
tacaswell committed Aug 26, 2014
2 parents 1cadc90 + 04f13a4 commit 05042c5
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions setupext.py
Original file line number Diff line number Diff line change
Expand Up @@ -1003,10 +1003,16 @@ class Png(SetupPackage):
name = "png"

def check(self):
status, output = getstatusoutput("libpng-config --version")
if status == 0:
version = output
else:
version = None

try:
return self._check_for_pkg_config(
'libpng', 'png.h',
min_version='1.2')
min_version='1.2', version=version)
except CheckFailed as e:
self.__class__.found_external = False
return str(e) + ' Using unknown version.'
Expand All @@ -1017,7 +1023,8 @@ def get_extension(self):
]
ext = make_extension('matplotlib._png', sources)
pkg_config.setup_extension(
ext, 'libpng', default_libraries=['png', 'z'])
ext, 'libpng', default_libraries=['png', 'z'],
alt_exec='libpng-config --ldflags')
Numpy().add_flags(ext)
CXX().add_flags(ext)
return ext
Expand Down

0 comments on commit 05042c5

Please sign in to comment.