[Skencil-commits] r734 - skencil/branches/skencil-0.6

[scm-commit@wald.intevation.org]

Author: igor_n
Date: 2010-09-23 04:04:20 +0200 (Thu, 23 Sep 2010)
New Revision: 734

Modified:
   skencil/branches/skencil-0.6/setup.py
Log:
fix for build vs tk8.5

Modified: skencil/branches/skencil-0.6/setup.py
===================================================================
--- skencil/branches/skencil-0.6/setup.py	2010-09-23 02:01:35 UTC (rev 733)
+++ skencil/branches/skencil-0.6/setup.py	2010-09-23 02:04:20 UTC (rev 734)
@@ -90,11 +90,27 @@
 
     #Fix for Debian based distros
     tcl_include_dirs = []
-    tcl_ver='8.4'
-    if os.path.isdir('/usr/include/tcl8.4'):
-        tcl_include_dirs = ['/usr/include/tcl8.4']
+    tcl_ver=''
+    if os.path.isdir('/usr/include/tcl8.5'):
+        tcl_include_dirs = ['/usr/include/tcl8.5']
+        tcl_ver ='8.5'
+        
+    if os.path.isdir('/usr/include/tcl8.6'):
+        tcl_include_dirs = ['/usr/include/tcl8.6']
+        tcl_ver ='8.6'
     
+    #Fix for OpenSuse
+    if not tcl_ver:
+        if os.path.isfile('/usr/lib/libtcl8.5.so'):
+            tcl_ver ='8.5'
+        if os.path.isfile('/usr/lib/libtcl8.6.so'):
+            tcl_ver ='8.6'
+            
+    if not tcl_ver:
+        print 'System tcl/tk =>8.5 libraries have not found!'
+        sys.exit(1)
     
+    
     paxtkinter_src=src_path+'extensions/Pax/'                
     paxtkinter_module = Extension('skencil.Sketch.Modules.paxtkinter',
             define_macros = [('MAJOR_VERSION', '1'),