Revision: 3657
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3657&view=rev
Author: mdboom
Date: 2007-08-01 08:06:29 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix erroneous message when wxPython devel headers are not even needed.
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 14:22:16 UTC (rev 3656)
+++ trunk/matplotlib/setupext.py 2007-08-01 15:06:29 UTC (rev 3657)
@@ -373,7 +373,7 @@
p = os.path.join(d, 'freetype2/lib')
if os.path.exists(p): module.library_dirs.append(p)
- module.libraries.append('z')
+ module.libraries.append('z')
add_base_flags(module)
if sys.platform == 'win32' and win32_compiler == 'mingw32':
@@ -470,7 +470,10 @@
except ImportError:
explanation = 'wxPython not found'
else:
- if sys.platform == 'win32' and win32_compiler == 'mingw32':
+ if getattr(wx, '__version__', '0.0')[0:3] >= '2.8':
+ print_status("wxPython", wx.__version__)
+ return True
+ elif sys.platform == 'win32' and win32_compiler == 'mingw32':
explanation = "The wxAgg extension can not be built using the
mingw32 compiler on Windows, since the default wxPython binary is built using
MS Visual Studio"
else:
wxconfig = find_wx_config()
@@ -491,15 +494,14 @@
gotit = True
if gotit:
- if getattr(wx, '__version__', '0.0')[0:3] < '2.8':
- module = Extension("test", [])
- add_wx_flags(module, wxconfig)
- if not find_include_file(
- module.include_dirs,
- os.path.join("wx", "wxPython", "wxPython.h")):
- explanation = ("Could not find wxPython headers in any of %s" %
+ module = Extension("test", [])
+ add_wx_flags(module, wxconfig)
+ if not find_include_file(
+ module.include_dirs,
+ 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
+ gotit = False
if gotit:
print_status("wxPython", wx.__version__)
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
