From 090effa56ca59d20301ebcc705d074687f603150 Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 24 Apr 2013 12:14:27 -0400 Subject: [PATCH] Use freetype-config if pkg-config is not installed --- setupext.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/setupext.py b/setupext.py index 63109aed297b..7297ef2d6e13 100644 --- a/setupext.py +++ b/setupext.py @@ -270,16 +270,23 @@ def set_pkgconfig_path(self): os.environ['PKG_CONFIG_PATH'] = pkgconfig_path def setup_extension(self, ext, package, default_include_dirs=[], - default_library_dirs=[], default_libraries=[]): + default_library_dirs=[], default_libraries=[], + alt_exec=None): """ Add parameters to the given `ext` for the given `package`. """ flag_map = { '-I': 'include_dirs', '-L': 'library_dirs', '-l': 'libraries'} - command = "pkg-config --libs --cflags " + package - use_defaults = True + executable = alt_exec if self.has_pkgconfig: + executable = 'pkg-config {0}'.format(package) + + use_defaults = True + + if executable is not None: + command = "{0} --libs --cflags ".format(executable) + try: output = check_output(command, shell=True) except subprocess.CalledProcessError: @@ -752,7 +759,8 @@ def add_flags(self, ext): 'lib/freetype2/include/freetype2'], default_library_dirs=[ 'freetype2/lib'], - default_libraries=['freetype', 'z']) + default_libraries=['freetype', 'z'], + alt_exec='freetype-config') class FT2Font(SetupPackage):