append rather than prepend cairo paths to ensure that internal/local paths come first as per the last configure sort by priority

This commit is contained in:
Dane Springmeyer 2013-01-10 17:08:58 -08:00
parent c649fa63dc
commit 805664056a

View file

@ -198,11 +198,11 @@ source = Split(
)
if env['HAS_CAIRO']:
lib_env.PrependUnique(LIBPATH=env['CAIRO_LIBPATHS'])
lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS'])
lib_env.Append(LIBS=env['CAIRO_LINKFLAGS'])
lib_env.Append(CXXFLAGS = '-DHAVE_CAIRO')
libmapnik_cxxflags.append('-DHAVE_CAIRO')
lib_env.PrependUnique(CPPPATH=copy(env['CAIRO_CPPPATHS']))
lib_env.AppendUnique(CPPPATH=copy(env['CAIRO_CPPPATHS']))
source.insert(0,'cairo_renderer.cpp')
source.insert(0,'cairo_context.cpp')