mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-19 06:50:07 +03:00
Merge branch 'master' into feature-575
This commit is contained in:
commit
993a42bed8
18
SConstruct
18
SConstruct
@ -127,15 +127,27 @@ else:
|
||||
main_env.Append(parsers='no')
|
||||
|
||||
if not main_env.GetOption('clean'):
|
||||
try:
|
||||
if mysql=='yes':
|
||||
main_env.ParseConfig('mysql_config --cflags --libs')
|
||||
except Exception, e:
|
||||
print ""
|
||||
print "mysql_config was not found in the path"
|
||||
print ""
|
||||
print "Check that mysql development package is installed and"
|
||||
print "mysql_config is in the path. If your mysql config tool"
|
||||
print "is called mysql5_config make a symlink as mysql_config"
|
||||
print "to a directory in the path."
|
||||
print ""
|
||||
exit(-1)
|
||||
|
||||
|
||||
try:
|
||||
main_env.ParseConfig(("LDFLAGS='%s' share/scons/get_xmlrpc_config"+
|
||||
" server") % (os.environ['LDFLAGS'],))
|
||||
main_env.ParseConfig(("LDFLAGS='%s' share/scons/get_xmlrpc_config"+
|
||||
" client") % (os.environ['LDFLAGS'],))
|
||||
|
||||
if mysql=='yes':
|
||||
main_env.ParseConfig('mysql_config --cflags --libs')
|
||||
|
||||
except Exception, e:
|
||||
print ""
|
||||
print "Error searching for xmlrpc-c libraries. Please check this"+\
|
||||
|
@ -118,7 +118,7 @@ private
|
||||
lines=text.split(/\n/)[2..-1]
|
||||
|
||||
lines.map do |line|
|
||||
line.split(/\s+/)[1]
|
||||
line.split(/\s+/).delete_if {|d| d.empty? }[1]
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user