Attachment #225115 for bug #311129

View | Details | Raw Unified | Return to bug 311129
Collapse All | Expand All

Lines 36-42 Link Here

(-)src/SConscript (-1 / +1 lines)
36	filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']	36	filesystem = 'boost_filesystem%s' % env['BOOST_APPEND']
37	regex = 'boost_regex%s' % env['BOOST_APPEND']	37	regex = 'boost_regex%s' % env['BOOST_APPEND']
38		38
39	libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj',env['ICU_LIB_NAME'],filesystem,regex]	39	libraries = ['freetype','ltdl','png','tiff','z','jpeg','proj',env['ICU_LIB_NAME'],'agg',filesystem,regex]
40		40
41	if '-DHAVE_CAIRO' in env['CXXFLAGS']:	41	if '-DHAVE_CAIRO' in env['CXXFLAGS']:
42	# add cairo and cairomm-1.0 to libs	42	# add cairo and cairomm-1.0 to libs

Return to bug 311129

Lines 260-269 Link Here

(-)SConstruct (-1 / +4 lines)
260	PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),	260	PathVariable('TIFF_LIBS', 'Search path for libtiff library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
261	PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),	261	PathVariable('PROJ_INCLUDES', 'Search path for PROJ.4 include files', '/usr/include', PathVariable.PathAccept),
262	PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),	262	PathVariable('PROJ_LIBS', 'Search path for PROJ.4 library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
		263	PathVariable('AGG_INCLUDES', 'Search path for AGG include files', '/usr/include/agg2', PathVariable.PathAccept),
		264	PathVariable('AGG_LIBS', 'Search path for AGG library files', '/usr/' + LIBDIR_SCHEMA, PathVariable.PathAccept),
263	('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''),	265	('PKG_CONFIG_PATH', 'Use this path to point pkg-config to .pc files instead of the PKG_CONFIG_PATH environment setting',''),
264		266
265	# Variables affecting rendering back-ends	267	# Variables affecting rendering back-ends
266	BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'True'),	268	BoolVariable('INTERNAL_LIBAGG', 'Use provided libagg', 'False'),
267		269
268	# Variables for optional dependencies	270	# Variables for optional dependencies
269	# Note: cairo, cairomm, and pycairo all optional but configured automatically through pkg-config	271	# Note: cairo, cairomm, and pycairo all optional but configured automatically through pkg-config
Lines 799-804 Link Here
799	['jpeg', ['stdio.h', 'jpeglib.h'], True,'C'],	801	['jpeg', ['stdio.h', 'jpeglib.h'], True,'C'],
800	['proj', 'proj_api.h', True,'C'],	802	['proj', 'proj_api.h', True,'C'],
801	[env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],	803	[env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
		804	['agg','agg2/agg_config.h' , True,'C++'],
802	]	805	]
803		806
804		807