diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2007-10-18 15:18:57 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2007-10-18 15:18:57 +0000 |
| commit | 8f7a0f517adc8bd49bbfbf024ae0992269801785 (patch) | |
| tree | ee0f82690f1b2b47c429f2a9f9a7c6a34f88a836 /numpy/distutils/system_info.py | |
| parent | bee10707e0d6537981458f4d75eb9a198a7728bc (diff) | |
| download | numpy-8f7a0f517adc8bd49bbfbf024ae0992269801785.tar.gz | |
Fix vectorize to work with strings. Fix where 64-bit looks for X11 libraries. Fix comment.
Diffstat (limited to 'numpy/distutils/system_info.py')
| -rw-r--r-- | numpy/distutils/system_info.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 7a1373442..c68308690 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -143,7 +143,18 @@ else: '/opt/include', '/usr/include', '/opt/local/include', '/sw/include'] default_src_dirs = ['.','/usr/local/src', '/opt/src','/sw/src'] - default_x11_lib_dirs = ['/usr/X11R6/lib','/usr/X11/lib','/usr/lib'] + + try: + platform = os.uname() + bit64 = platform[-1].endswith('64') + except: + bit64 = False + + if bit64: + default_x11_lib_dirs = ['/usr/lib64'] + else: + default_x11_lib_dirs = ['/usr/X11R6/lib','/usr/X11/lib','/usr/lib'] + default_x11_include_dirs = ['/usr/X11R6/include','/usr/X11/include', '/usr/include'] |