summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-08-22 05:02:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-08-22 14:05:58 +0200
commitaa74b6ade4af5da962acd1ebf43b9e719ebe1f51 (patch)
tree7a807e301a4d77f44ffae46f3cde38439294d91d
parent3dc720371368b670635f986f9a7bd412b00255a8 (diff)
downloadsamba-aa74b6ade4af5da962acd1ebf43b9e719ebe1f51.tar.gz
samba-aa74b6ade4af5da962acd1ebf43b9e719ebe1f51.tar.bz2
samba-aa74b6ade4af5da962acd1ebf43b9e719ebe1f51.zip
wafsamba: fix CHECK_XSLTPROC_MANPAGES().
-rw-r--r--buildtools/wafsamba/samba_conftests.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index c6f8901718..8a57d20baa 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -313,21 +313,14 @@ def CHECK_INLINE(conf):
def CHECK_XSLTPROC_MANPAGES(conf):
'''check if xsltproc can run with the given stylesheets'''
- stylesheets='http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
if not conf.CONFIG_SET('XSLTPROC'):
conf.find_program('xsltproc', var='XSLTPROC')
if not conf.CONFIG_SET('XSLTPROC'):
return False
- for s in TO_LIST(stylesheets):
- if not conf.CONFIG_SET('XSLTPROC_%s' % s):
- ret = conf.CHECK_COMMAND('%s --nonet %s 2> /dev/null' % (conf.env.XSLTPROC, s),
- msg='Checking for stylesheet %s' % s,
- define=None, on_target=False,
- boolean=True)
- if not ret:
- return False
- conf.env['XSLTPROC_%s' % s] = True
- conf.env['XSLTPROC_MANPAGES'] = True
- return True
+ s='http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
+ conf.CHECK_COMMAND('%s --nonet %s 2> /dev/null' % (conf.env.XSLTPROC, s),
+ msg='Checking for stylesheet %s' % s,
+ define='XSLTPROC_MANPAGES', on_target=False,
+ boolean=True)