[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  378295c build: detect if conf.env['CPP'] is an array or not
      from  1b63c78 waf: the libXX.inst.so file also depends on the vscript

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


- Log -----------------------------------------------------------------
commit 378295c3fe813c70815a14c7de608e4a859bd6cc
Author: Matthieu Patou <mat at matws.net>
Date:   Fri Dec 10 10:06:44 2010 +0300

    build: detect if conf.env['CPP'] is an array or not
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Fri Dec 10 10:18:20 CET 2010 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index 6476211..d0af9f2 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -61,12 +61,17 @@ def SAMBA_PIDL(bld, pname, source,
     cpp = ""
     cc = ""
     if bld.CONFIG_SET("CPP"):
-        cpp = "CPP=%s" % bld.CONFIG_GET("CPP")
+        if isinstance(bld.CONFIG_GET("CPP"), list):
+            cpp = "CPP=%s" % bld.CONFIG_GET("CPP")[0]
+        else:
+            cpp = "CPP=%s" % bld.CONFIG_GET("CPP")
+
     if bld.CONFIG_SET("CC"):
         if isinstance(bld.CONFIG_GET("CC"), list):
             cc = "CC=%s" % bld.CONFIG_GET("CC")[0]
         else:
             cc = "CC=%s" % bld.CONFIG_GET("CC")
+
     t = bld(rule='cd .. && %s %s ${PERL} "${PIDL}" --quiet ${OPTIONS} --outputdir ${OUTPUTDIR} -- "${SRC[0].abspath(env)}"' % (cpp, cc),
             ext_out    = '.c',
             before     = 'cc',


-- 
Samba Shared Repository