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

scons: fix up handling of plugin dependencies by making optional but warning after configure if not found

Browse source
This commit is contained in:
Dane Springmeyer 2009-03-01 06:45:59 +00:00
parent 0ec29dfe3b
commit fb1def644b
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
SConstruct
View file

@ -253,7 +253,10 @@ def parse_config(context, config, checks='--libs --cflags'):
if ret: if ret:
env.ParseConfig(cmd) env.ParseConfig(cmd)
else: else:
env['MISSING_DEPS'].append(tool) if config == 'GDAL_CONFIG':
env['SKIPPED_DEPS'].append(tool)
else:
env['MISSING_DEPS'].append(tool)
context.Result( ret ) context.Result( ret )
return ret return ret
@ -282,14 +285,14 @@ def parse_pg_config(context, config):
env.AppendUnique(CPPPATH = inc_path) env.AppendUnique(CPPPATH = inc_path)
env.AppendUnique(LIBPATH = lib_path) env.AppendUnique(LIBPATH = lib_path)
else: else:
env['MISSING_DEPS'].append(tool) env['SKIPPED_DEPS'].append(tool)
context.Result( ret ) context.Result( ret )
return ret return ret
def ogr_enabled(context): def ogr_enabled(context):
env = context.env env = context.env
context.Message( 'Checking if gdal is ogr enabled... ') context.Message( 'Checking if gdal is ogr enabled... ')
ret = context.TryAction('gdal-config --ogr-enabled')[0] ret = context.TryAction('%s --ogr-enabled' % env['GDAL_CONFIG'])[0]
if not ret: if not ret:
env['SKIPPED_DEPS'].append('ogr') env['SKIPPED_DEPS'].append('ogr')
context.Result( ret ) context.Result( ret )
@ -668,6 +671,10 @@ if not env.GetOption('clean'):
else: else:
color_print(4,"Did not use user config file, no custom path variables will be saved...") color_print(4,"Did not use user config file, no custom path variables will be saved...")
if env['SKIPPED_DEPS']:
color_print(1,'\nHowever, these optional dependencies were not found:\n - %s' % '\n - '.join(env['SKIPPED_DEPS']))
print
# fetch the mapnik version header in order to set the # fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/SConscript # ABI version used to build libmapnik.so on linux in src/SConscript
abi = conf.GetMapnikLibVersion() abi = conf.GetMapnikLibVersion()
@ -770,6 +777,7 @@ if not env.GetOption('clean'):
os.unlink(test) os.unlink(test)
except: pass except: pass
if 'configure' in command_line_args: if 'configure' in command_line_args:
color_print(4,'\n*Configure complete*\nNow run "python scons/scons.py" to build or "python scons/scons.py install" to install')
Exit(0) Exit(0)