sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: cleanup unneeded thread_flag check in Boost lib/header checking

Browse source
This commit is contained in:
Dane Springmeyer 2009-02-25 23:01:50 +00:00
parent 6d0ac8f05b
commit df8beaa952
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -492,7 +492,6 @@ else:
env['BOOST_APPEND'] = '' env['BOOST_APPEND'] = ''
for count, libinfo in enumerate(BOOST_LIBSHEADERS): for count, libinfo in enumerate(BOOST_LIBSHEADERS):
if thread_flag:
if not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0],env['BOOST_APPEND']), libinfo[1], 'C++'): if not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0],env['BOOST_APPEND']), libinfo[1], 'C++'):
if libinfo[2]: if libinfo[2]:
color_print(1,'Could not find required header or shared library for boost %s' % libinfo[0]) color_print(1,'Could not find required header or shared library for boost %s' % libinfo[0])
@ -501,10 +500,6 @@ for count, libinfo in enumerate(BOOST_LIBSHEADERS):
color_print(4,'Could not find optional header or shared library for boost %s' % libinfo[0]) color_print(4,'Could not find optional header or shared library for boost %s' % libinfo[0])
env['SKIPPED_DEPS'].append('boost ' + libinfo[0]) env['SKIPPED_DEPS'].append('boost ' + libinfo[0])
elif not conf.CheckLibWithHeader('boost_%s%s' % (libinfo[0], env['BOOST_APPEND']), libinfo[1], 'C++') :
color_print(1,'Could not find header or shared library for boost %s' % libinfo[0])
env['MISSING_DEPS'].append('boost ' + libinfo[0])
requested_plugins = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])] requested_plugins = [ driver.strip() for driver in Split(env['INPUT_PLUGINS'])]
color_print(4,'Checking for requested plugins dependencies...') color_print(4,'Checking for requested plugins dependencies...')