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

Remove MAPNIK_BUNDLED_SHARE_DIRECTORY build option

Browse source 
- this was intended to be used by python-mapnik
 - but it is not currently, so let's clean it up
 - todo: get actual ICU_DATA,PROJ_LIB,GDAL_DATA values from those depependent libs
This commit is contained in:
Dane Springmeyer 2016-03-16 13:48:26 -07:00
parent 61bcecbe95
commit 087add2c71
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
SConstruct
View file

@ -319,7 +319,6 @@ opts.AddVariables(
('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths (create multiple excludes separated by :)', ''), ('PATH_REMOVE', 'A path prefix to exclude from all known command and compile paths (create multiple excludes separated by :)', ''),
('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''), ('PATH_REPLACE', 'Two path prefixes (divided with a :) to search/replace from all known command and compile paths', ''),
('MAPNIK_NAME', 'Name of library', 'mapnik'), ('MAPNIK_NAME', 'Name of library', 'mapnik'),
BoolVariable('MAPNIK_BUNDLED_SHARE_DIRECTORY', 'For portable packaging: instruct mapnik-config to report relative paths to bundled GDAL_DATA, PROJ_LIB, and ICU_DATA','False'),
# Boost variables # Boost variables
# default is '/usr/include', see FindBoost method below # default is '/usr/include', see FindBoost method below

5
utils/mapnik-config/build.py
View file

@ -131,11 +131,6 @@ mapnik_bundled_gdal_data = ''
mapnik_bundled_proj_data = '' mapnik_bundled_proj_data = ''
mapnik_bundled_icu_data = '' mapnik_bundled_icu_data = ''
if config_env.get('MAPNIK_BUNDLED_SHARE_DIRECTORY'):
mapnik_bundled_gdal_data = 'lib/mapnik/share/gdal'
mapnik_bundled_proj_data = 'lib/mapnik/share/proj'
mapnik_bundled_icu_data = 'lib/mapnik/share/icu'
configuration = { configuration = {
"git_revision": git_revision, "git_revision": git_revision,
"git_describe": git_describe, "git_describe": git_describe,