numpy.distutils provides inaccurate system information for ubuntu-11.10

In the upcoming Ubuntu 11.10, the location of the X11 libraries and headers has changed. The new locations are /usr/{lib,include}/X11. Some third party packages, such as Enthought's Enable, depend on numpy.distutils to provide such information, but numpy is not aware of the changes in Ubuntu-11.10.

Running command ['/usr/bin/python', 'setup.py', 'develop', '--user'] in package enable
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/local/include/python2.7 is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/include/suitesparse/python2.7 is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/X11R6/lib64 is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/X11R6/lib is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/X11/lib64 is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/X11/lib is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/X11R6/include is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py:527:
  UserWarning: Specified path /usr/X11/include is invalid.
  warnings.warn('Specified path %s is invalid.' % d)
Traceback (most recent call last):
  File "setup.py", line 56, in <module>
    config = configuration().todict()
  File "setup.py", line 48, in configuration
    config.add_subpackage('kiva')
  File "/usr/lib/pymodules/python2.7/numpy/distutils/misc_util.py",
    line 972, in add_subpackage
    caller_level = 2)
  File "/usr/lib/pymodules/python2.7/numpy/distutils/misc_util.py",
    line 941, in get_subpackage
    caller_level = caller_level + 1)
  File "/usr/lib/pymodules/python2.7/numpy/distutils/misc_util.py",
    line 878, in _get_configuration_from_setup_py
    config = setup_module.configuration(*args)
  File "kiva/setup.py", line 27, in configuration
    config.add_subpackage('agg')
  File "/usr/lib/pymodules/python2.7/numpy/distutils/misc_util.py",
    line 972, in add_subpackage
    caller_level = 2)
  File "/usr/lib/pymodules/python2.7/numpy/distutils/misc_util.py",
    line 941, in get_subpackage
    caller_level = caller_level + 1)
  File "/usr/lib/pymodules/python2.7/numpy/distutils/misc_util.py",
    line 878, in _get_configuration_from_setup_py
    config = setup_module.configuration(*args)
  File "kiva/agg/setup.py", line 235, in configuration
    x11_info = get_info('x11', notfound_action=2)
  File "/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py",
    line 310, in get_info
    return cl().get_info(notfound_action)
  File "/usr/lib/pymodules/python2.7/numpy/distutils/system_info.py",
    line 461, in get_info
    raise self.notfounderror(self.notfounderror.__doc__)
numpy.distutils.system_info.X11NotFoundError: X11 libraries not found.

I've reported the problem upstream as well.

ProblemType: Bug
DistroRelease: Ubuntu 11.10
Package: python-numpy 1:1.5.1-2ubuntu1
ProcVersionSignature: Ubuntu 3.0.0-7.9-generic 3.0.0
Uname: Linux 3.0.0-7-generic x86_64
Architecture: amd64
Date: Sun Jul 31 09:52:26 2011
ProcEnviron:
 SHELL=/bin/bash
 PATH=(custom, user)
 LANG=en_US.UTF-8
 LANGUAGE=
SourcePackage: python-numpy
UpgradeStatus: Upgraded to oneiric on 2011-05-29 (63 days ago)