Revision: 3671
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3671&view=rev
Author: mdboom
Date: 2007-08-03 10:58:07 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
Change missing header file errors into warnings, since include paths
can be inserted in sneaky ways behind distutils' back ;)
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-03 17:27:20 UTC (rev 3670)
+++ trunk/matplotlib/setupext.py 2007-08-03 17:58:07 UTC (rev 3671)
@@ -240,26 +240,25 @@
for d in basedirs:
module.include_dirs.append(os.path.join(d, 'freetype2'))
+ print_status("freetype2", get_pkgconfig_version('freetype2'))
if not find_include_file(module.include_dirs, 'ft2build.h'):
print_message(
- "Could not find 'freetype2' headers in any of %s" %
+ "WARNING: Could not find 'freetype2' headers in any of %s." %
", ".join(["'%s'" % x for x in module.include_dirs]))
- return False
- print_status("freetype2", get_pkgconfig_version('freetype2'))
return True
def check_for_libpng():
module = Extension("test", [])
get_pkgconfig(module, 'libpng')
add_base_flags(module)
+
+ print_status("libpng", get_pkgconfig_version('libpng'))
if not find_include_file(module.include_dirs, 'png.h'):
print_message(
- ", ".join("Could not find 'libpng' headers in any of %s" %
- ["'%s'" % x for x in module.include_dirs]))
- return False
+ "Could not find 'libpng' headers in any of %s" %
+ ", ".join(["'%s'" % x for x in module.include_dirs]))
- print_status("libpng", get_pkgconfig_version('libpng'))
return True
def add_base_flags(module):
@@ -323,11 +322,10 @@
module = Extension('test', [])
add_numpy_flags(module)
add_base_flags(module)
+
+ print_status("numpy", numpy.__version__)
if not find_include_file(module.include_dirs, os.path.join("numpy",
"arrayobject.h")):
- print_status("numpy", "no")
print_message("Could not find the headers for numpy. You may need to
install the development package.")
- return False
- print_status("numpy", numpy.__version__)
return True
def add_numpy_flags(module):
@@ -408,7 +406,6 @@
explanation = (
"Could not find Gtk+ headers in any of %s" %
", ".join(["'%s'" % x for x in module.include_dirs]))
- gotit = False
def ver2str(tup):
return ".".join([str(x) for x in tup])
@@ -424,8 +421,10 @@
ver2str(gtk.pygtk_version), pygobject_version))
else:
print_status("Gtk+", "no")
+
+ if explanation is not None:
print_message(explanation)
-
+
return gotit
def add_pygtk_flags(module):
@@ -529,7 +528,6 @@
os.path.join("wx", "wxPython", "wxPython.h")):
explanation = ("Could not find wxPython headers in any of %s" %
", ".join(["'%s'" % x for x in
module.include_dirs]))
- gotit = False
if gotit:
print_status("wxPython", wx.__version__)
@@ -663,7 +661,6 @@
gotit = False
if not find_include_file(module.include_dirs, "tk.h"):
explanation = 'Tkinter present, but header files are not
installed. You may need to install development packages.'
- gotit = False
if gotit:
print_status("Tkinter", "Tkinter: %s, Tk: %s, Tcl: %s" %
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Matplotlib-checkins mailing list
Matplotlib-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
