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

scons: make second freetype check conditional on freetype-config availability

Browse source
This commit is contained in:
Dane Springmeyer 2011-10-29 22:34:38 -07:00
parent 820e1865dc
commit 64d98453f8
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SConstruct
View file

@ -1069,15 +1069,17 @@ if not preconfigured:
env.AppendUnique(CPPPATH = os.path.realpath(inc_path)) env.AppendUnique(CPPPATH = os.path.realpath(inc_path))
env.AppendUnique(LIBPATH = os.path.realpath(lib_path)) env.AppendUnique(LIBPATH = os.path.realpath(lib_path))
conf.parse_config('FREETYPE_CONFIG') if conf.parse_config('FREETYPE_CONFIG'):
# check if freetype links to bz2
# check if freetype links to bz2 if env['RUNTIME_LINK'] == 'static':
if env['RUNTIME_LINK'] == 'static': temp_env = env.Clone()
temp_env = env.Clone() temp_env['LIBS'] = []
temp_env['LIBS'] = [] try:
temp_env.ParseConfig('%s --libs' % env['FREETYPE_CONFIG']) temp_env.ParseConfig('%s --libs' % env['FREETYPE_CONFIG'])
if 'bz2' in temp_env['LIBS']: if 'bz2' in temp_env['LIBS']:
env['EXTRA_FREETYPE_LIBS'].append('bz2') env['EXTRA_FREETYPE_LIBS'].append('bz2')
except OSError,e:
pass
# libxml2 should be optional but is currently not # libxml2 should be optional but is currently not
# https://github.com/mapnik/mapnik/issues/913 # https://github.com/mapnik/mapnik/issues/913