Update of /cvsroot/freevo/kaa/base/src/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13172/src/base
Modified Files:
distribution.py
Log Message:
check all parameters in a different call (needed for libpng-config)
Index: distribution.py
===================================================================
RCS file: /cvsroot/freevo/kaa/base/src/base/distribution.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** distribution.py 7 Jul 2005 14:57:24 -0000 1.6
--- distribution.py 16 Jul 2005 15:35:07 -0000 1.7
***************
*** 75,96 ****
libraries. The basic logic is taken from pygame.
"""
- command = name + '-config --version --cflags --libs 2>/dev/null'
try:
! config = os.popen(command).readlines()
! if len(config) == 0:
raise ValueError, 'command not found'
! flags = (' '.join(config[1:]) + ' ').split()
! ver = config[0].strip()
! if minver and ver < minver:
err= 'requires %s version %s (%s found)' % \
! (name, minver, ver)
raise ValueError, err
! for f in flags:
! if f[:2] == '-I':
! self.include_dirs.append(f[2:])
! if f[:2] == '-L':
! self.library_dirs.append(f[2:])
! if f[:2] == '-l':
! self.libraries.append(f[2:])
return True
except Exception, e:
--- 75,100 ----
libraries. The basic logic is taken from pygame.
"""
try:
! #for parameter in ('version', 'cflags', 'libs'):
! command = name + '-config --version 2>/dev/null'
! version = os.popen(command).read().strip()
! if len(version) == 0:
raise ValueError, 'command not found'
! if minver and version < minver:
err= 'requires %s version %s (%s found)' % \
! (name, minver, version)
raise ValueError, err
!
! command = name + '-config --cflags 2>/dev/null'
! for inc in os.popen(command).read().strip().split(' '):
! if inc[2:] and not inc[2:] in self.include_dirs:
! self.include_dirs.append(inc[2:])
!
! command = name + '-config --libs 2>/dev/null'
! for flag in os.popen(command).read().strip().split(' '):
! if flag[:2] == '-L' and not flag[2:] in self.library_dirs:
! self.library_dirs.append(flag[2:])
! if flag[:2] == '-l' and not flag[2:] in self.libraries:
! self.libraries.append(flag[2:])
return True
except Exception, e:
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
