Add a dirs argument to get_info to look for npy-pkg-config files in additional directories.

1 files changed, 24 insertions, 6 deletions

diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index e92ca0c46..399fc6d34 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -1616,10 +1616,28 @@ def get_numpy_include_dirs():
     # else running numpy/core/setup.py
     return include_dirs
 
-def get_info(pkgname):
+def get_npy_pkg_dir():
+    """Return the path where to find the npy-pkg-config directory."""
+    # XXX: import here for bootstrapping reasons
+    import numpy
+    d = os.path.join(os.path.dirname(numpy.__file__),
+            'core', 'lib', 'npy-pkg-config')
+
+
+def get_info(pkgname, dirs=None):
     """Given a clib package name, returns a info dict with the necessary
     options to use the clib.
 
+    Parameters
+    ----------
+    pkgname: str
+        name of the package (should match the name of the .ini file, without
+        the extension, e.g. foo for the file foo.ini)
+    dirs: seq {None}
+        if given, should be a sequence of additional directories where to look
+        for npy-pkg-config files. Those directories are search prior to the
+        numpy one.
+
     Note
     ----
     Raise a numpy.distutils.PkgNotFound exception if the package is not
@@ -1630,14 +1648,14 @@ def get_info(pkgname):
     >>> npymath_info = get_info('npymath')
     >>> config.add_extension('foo', sources=['foo.c'], extra_info=npymath_info)
     """
-    # XXX: import here for bootstrapping reasons
-    import numpy
     from numpy.distutils.npy_pkg_config import read_config, parse_flags, \
             PkgNotFound
 
-    d = os.path.join(
-            os.path.dirname(numpy.__file__), 'core', 'lib', 'npy-pkg-config')
-    pkg_info = read_config(pkgname, [d])
+    if dirs:
+        dirs.append(get_npy_pkg_dir())
+    else:
+        dirs = [get_npy_pkg_dir()]
+    pkg_info = read_config(pkgname, dirs)
 
     # Translate LibraryInfo instance into a build_info dict
     info = parse_flags(pkg_info.cflags())