[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  e3997c2... wafsamba: Correctly detect if bld.env.XSLTPROC is not set
      from  cd2dd33... ldb: Support building with system ldb library

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e3997c2a6d82276cc736686099ab897fa4fd0047
Author: Kai Blin <kai at samba.org>
Date:   Mon May 31 09:39:44 2010 +0200

    wafsamba: Correctly detect if bld.env.XSLTPROC is not set
    
    This fixes the build on some build farm hosts and my machine.
    
    Jelmer, please check.

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/wafsamba.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index eb5aa91..41b866d 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -299,7 +299,7 @@ def SAMBA_BINARY(bld, binname, source,
     if subsystem_name is not None:
         bld.TARGET_ALIAS(subsystem_name, binname)
 
-    if manpages is not None and bld.env.XSLTPROC is not None:
+    if manpages is not None and 'XSLTPROC' in bld.env:
         bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
         for m in manpages.split():
             source = m + '.xml'


-- 
Samba Shared Repository