Permalink
Browse files

In site.cfg, change DEFAULT section to ALL to accommodate building on…

… Python 2.6.
  • Loading branch information...
1 parent 9807248 commit 004d77e503d8c0cabb5d87b03a4ce0bd8bd4cad0 @stefanv stefanv committed Mar 19, 2008
Showing with 7 additions and 7 deletions.
  1. +1 −1 numpy/distutils/environment.py
  2. +5 −5 numpy/distutils/system_info.py
  3. +1 −1 site.cfg.example
@@ -4,7 +4,7 @@
__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
@@ -63,19 +63,19 @@
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 @@ def get_paths(self, section, key):
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:
View
@@ -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

0 comments on commit 004d77e

Please sign in to comment.