summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-09-04 15:07:24 +0100
committerCarl Hetherington <cth@carlh.net>2015-09-04 15:47:23 +0100
commit0dc110449ef91a651eec075ca201040c4ed5bb1f (patch)
tree708f9a59218eaadf4c1817e83ef535209c527c44
parentb8611be3c3c393b6f012ee65eb8a4e12958415a0 (diff)
Fix erroneous libxml++ dependency on Centos 7.
-rw-r--r--cscript2
-rw-r--r--wscript1
2 files changed, 2 insertions, 1 deletions
diff --git a/cscript b/cscript
index 5ed7e76c0..049c0a842 100644
--- a/cscript
+++ b/cscript
@@ -261,7 +261,7 @@ def configure_options(target):
if target.version == '6.5':
opt += ' --static-boost --static-xmlpp'
elif target.version == '7':
- opt += ' --workaround-gssapi'
+ opt += ' --workaround-gssapi --static-xmlpp'
return opt
diff --git a/wscript b/wscript
index 1f39eb5ac..d77fadb8e 100644
--- a/wscript
+++ b/wscript
@@ -239,6 +239,7 @@ def configure(conf):
# libxml++
if conf.options.static_xmlpp:
conf.env.STLIB_XMLPP = ['xml++-2.6']
+ conf.env.LIB_XMLPP = ['xml2']
else:
conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)