SF.net SVN: matplotlib:[7037] branches/v0_98_5_maint/setupext.py

[<cm...@us...>]

Revision: 7037
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7037&view=rev
Author:   cmoad
Date:     2009-04-11 02:24:37 +0000 (Sat, 11 Apr 2009)

Log Message:
-----------
added python 2.6 / tcltk 8.5 check

Modified Paths:
--------------
    branches/v0_98_5_maint/setupext.py

Modified: branches/v0_98_5_maint/setupext.py
===================================================================
--- branches/v0_98_5_maint/setupext.py	2009-04-06 19:05:57 UTC (rev 7036)
+++ branches/v0_98_5_maint/setupext.py	2009-04-11 02:24:37 UTC (rev 7037)
@@ -958,11 +958,14 @@
     message = None
     if sys.platform == 'win32':
         major, minor1, minor2, s, tmp = sys.version_info
-        if major == 2 and minor1 in [3, 4, 5]:
-            module.include_dirs.extend(['win32_static/include/tcl8.4'])
+        if major == 2 and minor1 == 6:
+            module.include_dirs.extend(['win32_static/include/tcl85'])
+            module.libraries.extend(['tk85', 'tcl85'])
+        elif major == 2 and minor1 in [3, 4, 5]:
+            module.include_dirs.extend(['win32_static/include/tcl84'])
             module.libraries.extend(['tk84', 'tcl84'])
         elif major == 2 and minor1 == 2:
-            module.include_dirs.extend(['win32_static/include/tcl8.3'])
+            module.include_dirs.extend(['win32_static/include/tcl83'])
             module.libraries.extend(['tk83', 'tcl83'])
         else:
             raise RuntimeError('No tk/win32 support for this python version yet')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.