Merge pull request matplotlib#1322 from dmcdougall/mac_build

Update Mac build process. Fixes matplotlib#751

Author: efiring

test/TODO TODO_TESTStest/TODO renamed to TODO_TESTS

@@ -57,7 +57,7 @@
 basedir = defaultdict(lambda: ['/usr/local', '/usr'], {
     # execptions to the ['/usr/local', '/usr'] defaults
     'win32'  : ['win32_static',],
-    'darwin' : ['/usr/local/', '/usr', '/usr/X11'],
+    'darwin' : ['/usr/local/', '/usr', '/usr/X11', '/opt/local'],
     'sunos5' : [os.getenv('MPLIB_BASE') or '/usr/local',],
     'gnu0' : ['/usr'],
     'aix5' : ['/usr/local'],
@@ -258,6 +258,20 @@ def get_win32_compiler():
 else:
     std_libs = ['stdc++', 'm']
 
+def set_pkgconfig_path():
+    pkgconfig_path = sysconfig.get_config_var('LIBDIR')
+    if pkgconfig_path is None:
+        return
+
+    pkgconfig_path = os.path.join(pkgconfig_path, 'pkgconfig')
+    if not os.path.isdir(pkgconfig_path):
+        return
+
+    try:
+        os.environ['PKG_CONFIG_PATH'] += ':' + pkgconfig_path
+    except KeyError:
+        os.environ['PKG_CONFIG_PATH'] = pkgconfig_path
+
 def has_pkgconfig():
     if has_pkgconfig.cache is not None:
         return has_pkgconfig.cache
@@ -267,6 +281,10 @@ def has_pkgconfig():
         #print 'environ',  os.environ['PKG_CONFIG_PATH']
         status, output = getstatusoutput("pkg-config --help")
         has_pkgconfig.cache = (status == 0)
+
+        # Set the PKG_CONFIG_PATH environment variable
+        if has_pkgconfig.cache:
+            set_pkgconfig_path()
     return has_pkgconfig.cache
 has_pkgconfig.cache = None