Merge pull request #200 from zeehio/master

Linking fix in Linux
This commit is contained in:
Timothee "TTimo" Besset 2013-07-08 14:48:06 -07:00
commit aa185ce027

View file

@ -214,7 +214,7 @@ class Config:
print 'xml2-config failed' print 'xml2-config failed'
assert( False ) assert( False )
xml2libs = commands.getoutput( 'xml2-config --libs' ) xml2libs = commands.getoutput( 'xml2-config --libs' )
env.Append( LINKFLAGS = xml2libs.split( ' ' ) ) env.ParseConfig( 'xml2-config --libs' )
baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.split( ' ' ) ] baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.split( ' ' ) ]
if ( useGtk ): if ( useGtk ):
@ -402,6 +402,8 @@ class Config:
# print( module_ldd ) # print( module_ldd )
def find_library( output, libname ): def find_library( output, libname ):
print output
print libname
match = filter( lambda l : l.find( libname ) != -1, output.split( '\n' ) )[0] match = filter( lambda l : l.find( libname ) != -1, output.split( '\n' ) )[0]
return re.split( '.*=> (.*) .*', match )[1] return re.split( '.*=> (.*) .*', match )[1]