From 4bbc6ae3446fe1154d97741ba477f18bcc020816 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Tue, 21 Dec 2010 21:04:18 +0000 Subject: [PATCH] scons: get the geos lib name right for help output and make sure to pickle whether we are building sample plugins --- SConstruct | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index e2c636a0b..42e66ef3e 100644 --- a/SConstruct +++ b/SConstruct @@ -197,7 +197,7 @@ pretty_dep_names = { 'ociei':'Oracle database library | configure with OCCI_LIBS & OCCI_INCLUDES | more info: http://trac.mapnik.org/wiki/OCCI', 'gdal':'GDAL C++ library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: http://trac.mapnik.org/wiki/GDAL', 'ogr':'OGR-enabled GDAL C++ Library | configured using gdal-config program | try setting GDAL_CONFIG SCons option | more info: http://trac.mapnik.org/wiki/OGR', - 'geos':'GEOS Simple Geometry Specification C Library | configured with GEOS_LIB & GEOS_INCLUDE | more info: http://trac.mapnik.org/wiki/GEOS', + 'geos_c':'GEOS Simple Geometry Specification C Library | configured with GEOS_LIB & GEOS_INCLUDE | more info: http://trac.mapnik.org/wiki/GEOS', 'cairo':'Cairo C library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option', 'cairomm':'Cairomm C++ bindings to Cairo library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option', 'pycairo':'Python bindings to Cairo library | configured using pkg-config | try setting PKG_CONFIG_PATH SCons option', @@ -399,7 +399,8 @@ pickle_store = [# Scons internal variables 'HAS_PYCAIRO', 'HAS_LIBXML2', 'LIBTOOL_SUPPORTS_ADVISE', - 'PYTHON_IS_64BIT' + 'PYTHON_IS_64BIT', + 'SAMPLE_INPUT_PLUGINS', ] # Add all other user configurable options to pickle pickle_store @@ -1412,4 +1413,3 @@ if not HELP_REQUESTED: # if requested, build the sample input plugins if env['SAMPLE_INPUT_PLUGINS']: SConscript('plugins/input/templates/helloworld/build.py') -