scons: typo fix

This commit is contained in:
Dane Springmeyer 2009-03-01 00:03:50 +00:00
parent 67fe8b2c34
commit 0ec29dfe3b

View file

@ -245,6 +245,8 @@ def CheckPKG(context, name):
def parse_config(context, config, checks='--libs --cflags'): def parse_config(context, config, checks='--libs --cflags'):
env = context.env env = context.env
tool = config.lower().replace('_','-') tool = config.lower().replace('_','-')
if config == 'GDAL_CONFIG':
tool += ' %s' % checks
context.Message( 'Checking for %s... ' % tool) context.Message( 'Checking for %s... ' % tool)
cmd = '%s %s' % (env[config],checks) cmd = '%s %s' % (env[config],checks)
ret = context.TryAction(cmd)[0] ret = context.TryAction(cmd)[0]
@ -593,7 +595,7 @@ if not env.GetOption('clean'):
if not 'gdal' in env['REQUESTED_PLUGINS']: if not 'gdal' in env['REQUESTED_PLUGINS']:
conf.parse_config('GDAL_CONFIG',checks='--libs') conf.parse_config('GDAL_CONFIG',checks='--libs')
conf.parse_config('GDAL_CONFIG',checks='--cflags') conf.parse_config('GDAL_CONFIG',checks='--cflags')
libname = conf.get_pkg_lib('GDAL_CONFIG','gdal') libname = conf.get_pkg_lib('GDAL_CONFIG','ogr')
if libname: if libname:
details['lib'] = libname details['lib'] = libname