diff options
| author | Stefan van der Walt <stefan@sun.ac.za> | 2008-03-19 09:29:52 +0000 |
|---|---|---|
| committer | Stefan van der Walt <stefan@sun.ac.za> | 2008-03-19 09:29:52 +0000 |
| commit | 004d77e503d8c0cabb5d87b03a4ce0bd8bd4cad0 (patch) | |
| tree | d83fd884a17f2e88a02ba5708d2482be62325f07 | |
| parent | 98072488e6893f1ef8fdc32d994f08602542b5b3 (diff) | |
| download | numpy-004d77e503d8c0cabb5d87b03a4ce0bd8bd4cad0.tar.gz | |
In site.cfg, change DEFAULT section to ALL to accommodate building on Python 2.6.
| -rw-r--r-- | numpy/distutils/environment.py | 2 | ||||
| -rw-r--r-- | numpy/distutils/system_info.py | 10 | ||||
| -rw-r--r-- | site.cfg.example | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/numpy/distutils/environment.py b/numpy/distutils/environment.py index b923c8ed5..7ee5dffe6 100644 --- a/numpy/distutils/environment.py +++ b/numpy/distutils/environment.py @@ -4,7 +4,7 @@ from distutils.dist import Distribution __metaclass__ = type class EnvironmentConfig: - def __init__(self, distutils_section='DEFAULT', **kw): + def __init__(self, distutils_section='ALL', **kw): self._distutils_section = distutils_section self._conf_keys = kw self._conf = None diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index ea9ba1ca3..0288b29f2 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -63,19 +63,19 @@ The file 'site.cfg' is looked for in The first one found is used to get system configuration options The format is that used by ConfigParser (i.e., Windows .INI style). The -section DEFAULT has options that are the default for each section. The +section ALL has options that are the default for each section. The available sections are fftw, atlas, and x11. Appropiate defaults are used if nothing is specified. The order of finding the locations of resources is the following: 1. environment variable 2. section in site.cfg - 3. DEFAULT section in site.cfg + 3. ALL section in site.cfg Only the first complete match is returned. Example: ---------- -[DEFAULT] +[ALL] library_dirs = /usr/lib:/usr/local/lib:/opt/lib include_dirs = /usr/include:/usr/local/include:/opt/include src_dirs = /usr/local/src:/opt/src @@ -337,7 +337,7 @@ class system_info: """ get_info() is the only public method. Don't use others. """ - section = 'DEFAULT' + section = 'ALL' dir_env_var = None search_static_first = 0 # XXX: disabled by default, may disappear in # future unless it is proved to be useful. @@ -474,7 +474,7 @@ class system_info: if os.path.isdir(d1): ds2.append(d1) dirs = ds2 + dirs - default_dirs = self.cp.get('DEFAULT', key).split(os.pathsep) + default_dirs = self.cp.get(self.section, key).split(os.pathsep) dirs.extend(default_dirs) ret = [] for d in dirs: diff --git a/site.cfg.example b/site.cfg.example index bb05b63e3..27aeda661 100644 --- a/site.cfg.example +++ b/site.cfg.example @@ -55,7 +55,7 @@ # This is a good place to add general library and include directories like # /usr/local/{lib,include} # -#[DEFAULT] +#[ALL] #library_dirs = /usr/local/lib #include_dirs = /usr/local/include |