Merge pull request #1941 from mdboom/use-freetype-config

mdboom · mdboom · commit 656454f551d6 · 2013-04-24T09:58:59.000-07:00
Use freetype-config if pkg-config is not installed
diff --git 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):
