From 1af2f6b77f7be1e44359e1ca0a433f0df57d15b6 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 8 Jun 2009 09:23:59 +0000 Subject: [PATCH] scons: revert testing code --- SConstruct | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/SConstruct b/SConstruct index 17a8f84b4..0958fd506 100644 --- a/SConstruct +++ b/SConstruct @@ -167,7 +167,6 @@ opts.AddVariables( ('JOBS', 'Set the number of parallel compilations', "1", lambda key, value, env: int(value), int), BoolVariable('DEMO', 'Compile demo c++ application', 'False'), BoolVariable('PGSQL2SQLITE', 'Compile and install a utility to convert postgres tables to sqlite', 'False'), - BoolVariable('OGRINDEX', 'Compile and install a utility to index ogr datasources', 'False'), BoolVariable('COLOR_PRINT', 'Print build status information in color', 'True'), ) # variables to pickle after successful configure step @@ -561,8 +560,8 @@ if not preconfigured: ['z', 'zlib.h', True,'C'], ['jpeg', ['stdio.h', 'jpeglib.h'], True,'C'], ['proj', 'proj_api.h', True,'C'], - ['sicuuc','unicode/unistr.h',True,'C++'], - ['sicudata','unicode/utypes.h' , True,'C++'], + ['icuuc','unicode/unistr.h',True,'C++'], + ['icudata','unicode/utypes.h' , True,'C++'], ] # get boost version from boost headers rather than previous approach @@ -872,10 +871,6 @@ if env['DEMO']: # Build the pgsql2psqlite app if requested if env['PGSQL2SQLITE']: SConscript('utils/pgsql2sqlite/SConscript') - -# Build the ogrindex app if requested -if env['OGRINDEX']: - SConscript('utils/ogrindex/SConscript') # Build shapeindex and remove its dependency from the LIBS if 'boost_program_options%s' % env['BOOST_APPEND'] in env['LIBS']: @@ -905,7 +900,6 @@ for plugin in env['REQUESTED_PLUGINS']: # Build the Python bindings if 'python' in env['BINDINGS']: SConscript('bindings/python/SConscript') - SConscript('utils/mapnik-config/SConscript') # Configure fonts and if requested install the bundled DejaVu fonts SConscript('fonts/SConscript')