|
Line
Link Here
|
| 0 |
-- a/SConstruct |
0 |
++ b/SConstruct |
|
Lines 317-323
Link Here
|
| 317 |
('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), |
317 |
('LINK_PRIORITY','Priority list in which to sort library and include paths (default order is internal, other, frameworks, user, then system - see source of `sort_paths` function for more detail)',','.join(DEFAULT_LINK_PRIORITY)), |
| 318 |
|
318 |
|
| 319 |
# Install Variables |
319 |
# Install Variables |
| 320 |
('PREFIX', 'The install path "prefix"', '/usr/local'), |
320 |
('PREFIX', 'The install path "prefix"', '/usr'), |
| 321 |
('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), |
321 |
('LIBDIR_SCHEMA', 'The library sub-directory appended to the "prefix", sometimes lib64 on 64bit linux systems', LIBDIR_SCHEMA_DEFAULT), |
| 322 |
('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), |
322 |
('DESTDIR', 'The root directory to install into. Useful mainly for binary package building', '/'), |
| 323 |
('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), |
323 |
('PATH', 'A custom path (or multiple paths divided by ":") to append to the $PATH env to prioritize usage of command line programs (if multiple are present on the system)', ''), |
|
Lines 1222-1227
Link Here
|
| 1222 |
|
1222 |
|
| 1223 |
color_print(4,'Configuring build environment...') |
1223 |
color_print(4,'Configuring build environment...') |
| 1224 |
|
1224 |
|
|
|
1225 |
OPTIONAL_LIBSHEADERS = [] |
| 1226 |
|
| 1225 |
if not env['FAST']: |
1227 |
if not env['FAST']: |
| 1226 |
SetCacheMode('force') |
1228 |
SetCacheMode('force') |
| 1227 |
|
1229 |
|
|
Lines 1410-1416
Link Here
|
| 1410 |
# https://github.com/mapnik/mapnik/issues/913 |
1412 |
# https://github.com/mapnik/mapnik/issues/913 |
| 1411 |
if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2': |
1413 |
if env.get('XMLPARSER') and env['XMLPARSER'] == 'libxml2': |
| 1412 |
if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'): |
1414 |
if env.get('XML2_LIBS') or env.get('XML2_INCLUDES'): |
| 1413 |
OPTIONAL_LIBSHEADERS.insert(0,['libxml2','libxml/parser.h',True,'C']) |
1415 |
# code doesn't actually use HAVE_XMML2 but set just to have a fifth value |
|
|
1416 |
OPTIONAL_LIBSHEADERS.append(['libxml2','libxml/parser.h',True,'C','-DHAVE_XML2']) |
| 1414 |
if env.get('XML2_INCLUDES'): |
1417 |
if env.get('XML2_INCLUDES'): |
| 1415 |
inc_path = env['XML2_INCLUDES'] |
1418 |
inc_path = env['XML2_INCLUDES'] |
| 1416 |
env.AppendUnique(CPPPATH = fix_path(inc_path)) |
1419 |
env.AppendUnique(CPPPATH = fix_path(inc_path)) |
|
Lines 1428-1435
Link Here
|
| 1428 |
else: |
1431 |
else: |
| 1429 |
env['SKIPPED_DEPS'].extend(['dlfcn']) |
1432 |
env['SKIPPED_DEPS'].extend(['dlfcn']) |
| 1430 |
|
1433 |
|
| 1431 |
OPTIONAL_LIBSHEADERS = [] |
|
|
| 1432 |
|
| 1433 |
if env['JPEG']: |
1434 |
if env['JPEG']: |
| 1434 |
OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) |
1435 |
OPTIONAL_LIBSHEADERS.append(['jpeg', ['stdio.h', 'jpeglib.h'], False,'C','-DHAVE_JPEG']) |
| 1435 |
inc_path = env['%s_INCLUDES' % 'JPEG'] |
1436 |
inc_path = env['%s_INCLUDES' % 'JPEG'] |
