[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  9e3511e... pidl/wscript: build manpages in build group 'final'
       via  b0b2b4f... pidl/wscript: only try to build pidl manpages if pod2man is available
       via  e80f576... pidl/wscript: call pod2man with the detected perl version
      from  9328097... s3-waf: Fix the OSX 10.4 build by adding an explicit resolv dep on smbclient

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


- Log -----------------------------------------------------------------
commit 9e3511ef1cf9b278cff04f1c883aed487876b93a
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 17 08:55:10 2010 +0200

    pidl/wscript: build manpages in build group 'final'
    
    So that waf --target=smbtorture doesn't build them
    
    metze

commit b0b2b4ff8bbcf80976b95b587aa7427c70c11b06
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 17 08:49:36 2010 +0200

    pidl/wscript: only try to build pidl manpages if pod2man is available
    
    metze

commit e80f576db66ad04592ac436ed74ceb9b96452060
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Jun 17 08:44:53 2010 +0200

    pidl/wscript: call pod2man with the detected perl version
    
    Some systems like SLES11 have a broken perl path in pod2man.
    
    metze

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

Summary of changes:
 pidl/wscript |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/pidl/wscript b/pidl/wscript
index 0c3c415..f2b65c8 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -15,6 +15,7 @@ def configure(conf):
 
     # yapp is used for building the parser
     conf.find_program('yapp', var='YAPP')
+    conf.find_program('pod2man', var='POD2MAN')
 
 def build(bld):
     bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=0755)
@@ -46,13 +47,14 @@ def build(bld):
 
     link_command = 'rm -rf blib && ln -fs blib %s' % blib_bld
     
-    bld.SET_BUILD_GROUP('main')
-    for src, manpage in pidl_manpages.iteritems():
-        bld(rule='pod2man -c "Samba Documentation" ${SRC} ${TGT}', 
-            shell=True,
-            source=src,
-            install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
-            target=os.path.basename(manpage))
+    bld.SET_BUILD_GROUP('final')
+    if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
+        for src, manpage in pidl_manpages.iteritems():
+            bld(rule='${PERL} ${POD2MAN} -c "Samba Documentation" ${SRC} ${TGT}',
+                shell=True,
+                source=src,
+                install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
+                target=os.path.basename(manpage))
 
     # we want to prefer the git version of the parsers if we can. Only if the
     # source has changed do we want to re-run yapp


-- 
Samba Shared Repository