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

Merge pull request #4114 from sebastic/libxml2

Browse source 
Use pkg-config for libxml2.
This commit is contained in:
Artem Pavlenko 2020-01-21 15:09:08 +00:00 committed by GitHub
commit fe893134a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
SConstruct
View file

@ -1523,6 +1523,21 @@ if not preconfigured:
if env.get('XML2_LIBS'):
lib_path = env['XML2_LIBS']
env.AppendUnique(LIBPATH = fix_path(lib_path))
elif CHECK_PKG_CONFIG and conf.CheckPKG('libxml-2.0'):
# libxml2 2.9.10+ doesn't use xml2-config and uses pkg-config instead
cmd = 'pkg-config libxml-2.0 --libs --cflags'
temp_env = Environment(ENV=os.environ)
try:
temp_env.ParseConfig(cmd)
for inc in temp_env['CPPPATH']:
env.AppendUnique(CPPPATH = fix_path(inc))
env['HAS_LIBXML2'] = True
for lib in temp_env['LIBS']:
env.AppendUnique(LIBPATH = fix_path(lib))
env['HAS_LIBXML2'] = True
except OSError as e:
pass
elif conf.parse_config('XML2_CONFIG',checks='--cflags'):
env['HAS_LIBXML2'] = True
else: