pd/src SConscript,1.1.4.55,1.1.4.56 - Pd-cvs

13 Nov 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31776
Modified Files:
      Tag: devel_0_39
    SConscript 
Log Message:
use latest available Tcl/Tk instead of oldest.
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.55
retrieving revision 1.1.4.56
diff -C2 -d -r1.1.4.55 -r1.1.4.56
*** SConscript	22 Aug 2006 19:11:42 -0000	1.1.4.55
--- SConscript	13 Nov 2006 00:05:44 -0000	1.1.4.56
***************
*** 186,190 ****
  if pdenv['PLATFORM'] != 'darwin':
      if not conf.CheckLib('tcl','Tcl_Init'):
!         for i in range (0,10):
              if conf.CheckLib('tcl8%s%d' % (sep,i),'Tcl_Init'):
                  break
--- 186,190 ----
  if pdenv['PLATFORM'] != 'darwin':
      if not conf.CheckLib('tcl','Tcl_Init'):
!         for i in range (9,-1,-1):
              if conf.CheckLib('tcl8%s%d' % (sep,i),'Tcl_Init'):
                  break
***************
*** 194,198 ****
if not conf.CheckLib('tk','Tk_Init'):
!         for i in range (0,10):
              if conf.CheckLib('tk8%s%d' % (sep,i),'Tk_Init'):
                  break
--- 194,198 ----
if not conf.CheckLib('tk','Tk_Init'):
!         for i in range (9,-1,-1):
              if conf.CheckLib('tk8%s%d' % (sep,i),'Tk_Init'):
                  break
***************
*** 203,207 ****
           conf.CheckHeader('tcl/tcl.h')
           ):
!         for i in range (0,10):
              if conf.CheckHeader('tcl8.%d/tcl.h' % i):
                  add_cpppath.append('/usr/include/tcl8.%d/' % i)
--- 203,207 ----
           conf.CheckHeader('tcl/tcl.h')
           ):
!         for i in range (9,-1,-1):
              if conf.CheckHeader('tcl8.%d/tcl.h' % i):
                  add_cpppath.append('/usr/include/tcl8.%d/' % i)
***************
*** 213,222 ****
           conf.CheckHeader('tk/tk.h')
           ):
!         for i in range (0,10):
              if conf.CheckHeader('tk8.%d/tk.h' % i):
                  add_cpppath.append('/usr/include/tk8.%d/' % i)
                  break
          else:
!             for i in range (0,10):
                  if conf.CheckHeader('tcl8.%d/tk.h' % i):
                      break
--- 213,222 ----
           conf.CheckHeader('tk/tk.h')
           ):
!         for i in range (9,-1,-1):
              if conf.CheckHeader('tk8.%d/tk.h' % i):
                  add_cpppath.append('/usr/include/tk8.%d/' % i)
                  break
          else:
!             for i in range (9,-1,-1):
                  if conf.CheckHeader('tcl8.%d/tk.h' % i):
                      break